Telecominfraproject/wlan-cloud-services
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-services.git synced 2026-01-27 10:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIFI-3166] Session ID is a -ve number in opensyncgw logs and on UI logs

Browse Source 
Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
This commit is contained in:
Mike Hansen
2021-07-19 18:03:13 -04:00
parent 1e277f5650
commit 4a764db007
32 changed files with 184 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
all-cloud-and-opensync-gw-in-one-process/src/main/java/com/telecominfraproject/wlan/startuptasks/AllInOneWithGatewayStartListener.java
View File

@@ -811,10 +811,10 @@ public class AllInOneWithGatewayStartListener implements ApplicationRunner {
sessionDetails.setRadioType(radioType);
sessionDetails.setSecurityType(SecurityType.PSK);
sessionDetails.setSsid(ssidConfig.getSsid());
sessionDetails.setSessionId(System.currentTimeMillis());
sessionDetails.setSessionId(Long.toUnsignedString(System.currentTimeMillis()));
sessionDetails.setAssocTimestamp(System.currentTimeMillis() - getRandomLong(10000, 1000000));
ClientDhcpDetails dhcpDetails = new ClientDhcpDetails(System.currentTimeMillis());
ClientDhcpDetails dhcpDetails = new ClientDhcpDetails(Long.toUnsignedString(System.currentTimeMillis()));
dhcpDetails.setLeaseStartTimestamp(System.currentTimeMillis() - getRandomLong(0, TimeUnit.HOURS.toMillis(4)));
dhcpDetails.setLeaseTimeInSeconds((int)TimeUnit.HOURS.toSeconds(4));
try {

10
all-cloud-in-one-process/src/main/java/com/telecominfraproject/wlan/startuptasks/AllInOneStartListener.java
View File

@@ -1238,7 +1238,7 @@ public class AllInOneStartListener implements ApplicationRunner {
clientMetrics.setNumRxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setNumTxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(Long.toUnsignedString(getRandomLong(3000000, 7000000)));
clientMetrics.setTxRetries(getRandomInt(30, 70));
clientMetrics.setRxDuplicatePackets(getRandomInt(30, 70));
@@ -1265,7 +1265,7 @@ public class AllInOneStartListener implements ApplicationRunner {
clientMetrics.setNumRxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setNumTxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(Long.toUnsignedString(getRandomLong(3000000, 7000000)));
clientMetrics.setTxRetries(getRandomInt(30, 70));
clientMetrics.setRxDuplicatePackets(getRandomInt(30, 70));
@@ -1292,7 +1292,7 @@ public class AllInOneStartListener implements ApplicationRunner {
clientMetrics.setNumRxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setNumTxBytes(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(getRandomLong(3000000, 7000000));
clientMetrics.setSessionId(Long.toUnsignedString(getRandomLong(3000000, 7000000)));
clientMetrics.setTxRetries(getRandomInt(30, 70));
clientMetrics.setRxDuplicatePackets(getRandomInt(30, 70));
@@ -1361,10 +1361,10 @@ public class AllInOneStartListener implements ApplicationRunner {
sessionDetails.setRadioType(radioType);
sessionDetails.setSecurityType(SecurityType.PSK);
sessionDetails.setSsid(ssidConfig.getSsid());
sessionDetails.setSessionId(System.currentTimeMillis());
sessionDetails.setSessionId(Long.toUnsignedString(System.currentTimeMillis()));
sessionDetails.setAssocTimestamp(System.currentTimeMillis() - getRandomLong(10000, 1000000));
ClientDhcpDetails dhcpDetails = new ClientDhcpDetails(System.currentTimeMillis());
ClientDhcpDetails dhcpDetails = new ClientDhcpDetails(Long.toUnsignedString(System.currentTimeMillis()));
dhcpDetails
.setLeaseStartTimestamp(System.currentTimeMillis() - getRandomLong(0, TimeUnit.HOURS.toMillis(4)));
dhcpDetails.setLeaseTimeInSeconds((int) TimeUnit.HOURS.toSeconds(4));

8
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientAssocEvent.java
View File

@@ -12,7 +12,7 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEvent
public class ClientAssocEvent extends RealTimeEvent implements HasClientMac {
private static final long serialVersionUID = 7015822981315570338L;
private long sessionId;
private String sessionId;
private String ssid;
private MacAddress clientMacAddress;
private RadioType radioType;
@@ -29,7 +29,7 @@ public class ClientAssocEvent extends RealTimeEvent implements HasClientMac {
}
public ClientAssocEvent(int customerId, long locationId, long equipmentId, long timestamp, long sessionId, String ssid,
public ClientAssocEvent(int customerId, long locationId, long equipmentId, long timestamp, String sessionId, String ssid,
MacAddress clientMacAddress, RadioType radioType, boolean isReassociation, WlanStatusCode status,
Integer internalSC, Integer rssi) {
super(RealTimeEventType.STA_Client_Assoc, customerId, locationId, equipmentId, timestamp);
@@ -50,7 +50,7 @@ public class ClientAssocEvent extends RealTimeEvent implements HasClientMac {
/**
* @return the sessionId
*/
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
@@ -58,7 +58,7 @@ public class ClientAssocEvent extends RealTimeEvent implements HasClientMac {
* @param sessionId
* the sessionId to set
*/
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientAuthEvent.java
View File

@@ -13,7 +13,7 @@ public class ClientAuthEvent extends RealTimeEvent implements HasClientMac {
private static final long serialVersionUID = 1221389696911864515L;
private long sessionId;
private String sessionId;
private String ssid;
private MacAddress clientMacAddress;
private WlanStatusCode authStatus;
@@ -32,11 +32,11 @@ public class ClientAuthEvent extends RealTimeEvent implements HasClientMac {
super(eventType, timestamp);
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientConnectSuccessEvent.java
View File

@@ -14,7 +14,7 @@ public class ClientConnectSuccessEvent extends RealTimeEvent implements HasClien
private static final long serialVersionUID = -6082134146801575193L;
private MacAddress clientMacAddress;
private long sessionId;
private String sessionId;
private RadioType radioType;
private boolean isReassociation;
private String ssid;
@@ -61,7 +61,7 @@ public class ClientConnectSuccessEvent extends RealTimeEvent implements HasClien
/**
* @return the sessionId
*/
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
@@ -69,7 +69,7 @@ public class ClientConnectSuccessEvent extends RealTimeEvent implements HasClien
* @param sessionId
* the sessionId to set
*/
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientDisconnectEvent.java
View File

@@ -45,7 +45,7 @@ public class ClientDisconnectEvent extends RealTimeEvent implements HasClientMac
}
private static final long serialVersionUID = -7674230178565760938L;
private long sessionId;
private String sessionId;
private byte[] macAddressBytes;
private MacAddress clientMacAddress;
private long lastRecvTime;
@@ -104,7 +104,7 @@ public class ClientDisconnectEvent extends RealTimeEvent implements HasClientMac
return rssi;
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
@@ -148,7 +148,7 @@ public class ClientDisconnectEvent extends RealTimeEvent implements HasClientMac
this.rssi = rssi;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientFailureEvent.java
View File

@@ -14,7 +14,7 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEvent
public class ClientFailureEvent extends RealTimeEvent implements HasClientMac {
private static final long serialVersionUID = -16021752050335131L;
private long sessionId;
private String sessionId;
private String ssid;
private MacAddress clientMacAddress;
private WlanReasonCode reasonCode;
@@ -38,11 +38,11 @@ public class ClientFailureEvent extends RealTimeEvent implements HasClientMac {
this.clientMacAddress = clientMacAddress;
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientFirstDataEvent.java
View File

@@ -10,7 +10,7 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEvent
public class ClientFirstDataEvent extends RealTimeEvent implements HasClientMac {
private static final long serialVersionUID = 298223061973506469L;
private long sessionId;
private String sessionId;
private MacAddress clientMacAddress;
private long firstDataRcvdTs;
private long firstDataSentTs;
@@ -28,11 +28,11 @@ public class ClientFirstDataEvent extends RealTimeEvent implements HasClientMac
super(eventType, timestamp);
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

55
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientIdEvent.java
View File

@@ -1,6 +1,7 @@
package com.telecominfraproject.wlan.client.models.events.realtime;
import java.util.Arrays;
import java.util.Objects;
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
import com.telecominfraproject.wlan.core.model.json.interfaces.HasClientMac;
@@ -10,7 +11,7 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEvent
public class ClientIdEvent extends RealTimeEvent implements HasClientMac {
private static final long serialVersionUID = 298223061973506469L;
private long sessionId;
private String sessionId;
private byte[] macAddressBytes;
private MacAddress clientMacAddress;
private String userId;
@@ -27,7 +28,7 @@ public class ClientIdEvent extends RealTimeEvent implements HasClientMac {
/**
* @return the sessionId
*/
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
@@ -35,7 +36,7 @@ public class ClientIdEvent extends RealTimeEvent implements HasClientMac {
* @param sessionId
* the sessionId to set
*/
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}
@@ -65,58 +66,28 @@ public class ClientIdEvent extends RealTimeEvent implements HasClientMac {
this.userId = userId;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
int result = super.hashCode();
result = prime * result + Arrays.hashCode(macAddressBytes);
result = prime * result + (int) (sessionId ^ (sessionId >>> 32));
result = prime * result + ((userId == null) ? 0 : userId.hashCode());
result = prime * result + ((clientMacAddress == null) ? 0 : clientMacAddress.hashCode());
result = prime * result + Objects.hash(clientMacAddress, sessionId, userId);
return result;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
if (this == obj)
return true;
}
if (obj == null) {
if (!super.equals(obj))
return false;
}
if (!super.equals(obj)) {
if (getClass() != obj.getClass())
return false;
}
if (!(obj instanceof ClientIdEvent)) {
return false;
}
ClientIdEvent other = (ClientIdEvent) obj;
if (!Arrays.equals(macAddressBytes, other.macAddressBytes))
return false;
if (sessionId != other.sessionId)
return false;
if (userId == null) {
if (other.userId != null)
return false;
} else if (!userId.equals(other.userId))
return false;
if (clientMacAddress == null) {
if (other.clientMacAddress != null)
return false;
} else if (!clientMacAddress.equals(other.clientMacAddress))
return false;
return true;
return Objects.equals(clientMacAddress, other.clientMacAddress) && Arrays.equals(macAddressBytes, other.macAddressBytes)
&& Objects.equals(sessionId, other.sessionId) && Objects.equals(userId, other.userId);
}
@Override

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientIpAddressEvent.java
View File

@@ -12,7 +12,7 @@ public class ClientIpAddressEvent extends RealTimeEvent implements HasClientMac
private static final long serialVersionUID = -5332534925768685589L;
private long sessionId;
private String sessionId;
private MacAddress clientMacAddress;
private InetAddress ipAddr;
@@ -29,11 +29,11 @@ public class ClientIpAddressEvent extends RealTimeEvent implements HasClientMac
super(eventType, timestamp);
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

6
client-models/src/main/java/com/telecominfraproject/wlan/client/models/events/realtime/ClientTimeoutEvent.java
View File

@@ -26,7 +26,7 @@ public class ClientTimeoutEvent extends RealTimeEvent implements HasClientMac {
}
}
private long sessionId;
private String sessionId;
private MacAddress clientMacAddress;
private long lastRecvTime;
private long lastSentTime;
@@ -45,11 +45,11 @@ public class ClientTimeoutEvent extends RealTimeEvent implements HasClientMac {
super(eventType, timestamp);
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

172
client-models/src/main/java/com/telecominfraproject/wlan/client/session/models/ClientDhcpDetails.java
View File

@@ -1,6 +1,7 @@
package com.telecominfraproject.wlan.client.session.models;
import java.net.InetAddress;
import java.util.Objects;
import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility;
import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
@@ -29,10 +30,9 @@ public class ClientDhcpDetails extends BaseJsonModel {
/**
* Identifies the association where DHCP last occurred.
*/
private long associationId;
private String associationId;
public ClientDhcpDetails(long sessionId) {
public ClientDhcpDetails(String sessionId) {
this.associationId = sessionId;
}
@@ -101,10 +101,10 @@ public class ClientDhcpDetails extends BaseJsonModel {
this.firstDiscoverTimestamp = firstDiscoverTimestamp;
}
public long getAssociationId() {
public String getAssociationId() {
return associationId;
}
public void setAssociationId(Long associationId) {
public void setAssociationId(String associationId) {
this.associationId = associationId;
}
@@ -116,123 +116,6 @@ public class ClientDhcpDetails extends BaseJsonModel {
this.nakTimestamp = nakTimestamp;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + (int) (associationId ^ (associationId >>> 32));
result = prime * result + ((dhcpServerIp == null) ? 0 : dhcpServerIp.hashCode());
result = prime * result + ((firstDiscoverTimestamp == null) ? 0 : firstDiscoverTimestamp.hashCode());
result = prime * result + ((firstOfferTimestamp == null) ? 0 : firstOfferTimestamp.hashCode());
result = prime * result + ((firstRequestTimestamp == null) ? 0 : firstRequestTimestamp.hashCode());
result = prime * result + (fromInternal ? 1231 : 1237);
result = prime * result + ((gatewayIp == null) ? 0 : gatewayIp.hashCode());
result = prime * result + ((leaseStartTimestamp == null) ? 0 : leaseStartTimestamp.hashCode());
result = prime * result + ((leaseTimeInSeconds == null) ? 0 : leaseTimeInSeconds.hashCode());
result = prime * result + ((nakTimestamp == null) ? 0 : nakTimestamp.hashCode());
result = prime * result + ((primaryDns == null) ? 0 : primaryDns.hashCode());
result = prime * result + ((secondaryDns == null) ? 0 : secondaryDns.hashCode());
result = prime * result + ((subnetMask == null) ? 0 : subnetMask.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (!(obj instanceof ClientDhcpDetails)) {
return false;
}
ClientDhcpDetails other = (ClientDhcpDetails) obj;
if (associationId != other.associationId) {
return false;
}
if (dhcpServerIp == null) {
if (other.dhcpServerIp != null) {
return false;
}
} else if (!dhcpServerIp.equals(other.dhcpServerIp)) {
return false;
}
if (firstDiscoverTimestamp == null) {
if (other.firstDiscoverTimestamp != null) {
return false;
}
} else if (!firstDiscoverTimestamp.equals(other.firstDiscoverTimestamp)) {
return false;
}
if (firstOfferTimestamp == null) {
if (other.firstOfferTimestamp != null) {
return false;
}
} else if (!firstOfferTimestamp.equals(other.firstOfferTimestamp)) {
return false;
}
if (firstRequestTimestamp == null) {
if (other.firstRequestTimestamp != null) {
return false;
}
} else if (!firstRequestTimestamp.equals(other.firstRequestTimestamp)) {
return false;
}
if (fromInternal != other.fromInternal) {
return false;
}
if (gatewayIp == null) {
if (other.gatewayIp != null) {
return false;
}
} else if (!gatewayIp.equals(other.gatewayIp)) {
return false;
}
if (leaseStartTimestamp == null) {
if (other.leaseStartTimestamp != null) {
return false;
}
} else if (!leaseStartTimestamp.equals(other.leaseStartTimestamp)) {
return false;
}
if (leaseTimeInSeconds == null) {
if (other.leaseTimeInSeconds != null) {
return false;
}
} else if (!leaseTimeInSeconds.equals(other.leaseTimeInSeconds)) {
return false;
}
if (nakTimestamp == null) {
if (other.nakTimestamp != null) {
return false;
}
} else if (!nakTimestamp.equals(other.nakTimestamp)) {
return false;
}
if (primaryDns == null) {
if (other.primaryDns != null) {
return false;
}
} else if (!primaryDns.equals(other.primaryDns)) {
return false;
}
if (secondaryDns == null) {
if (other.secondaryDns != null) {
return false;
}
} else if (!secondaryDns.equals(other.secondaryDns)) {
return false;
}
if (subnetMask == null) {
if (other.subnetMask != null) {
return false;
}
} else if (!subnetMask.equals(other.subnetMask)) {
return false;
}
return true;
}
@Override
public ClientDhcpDetails clone() {
ClientDhcpDetails ret = (ClientDhcpDetails) super.clone();
@@ -241,25 +124,8 @@ public class ClientDhcpDetails extends BaseJsonModel {
public void mergeDetails(ClientDhcpDetails other) {
if(other == null) return;
if(WiFiSessionUtility.decodeWiFiAssociationId(other.associationId)>WiFiSessionUtility.decodeWiFiAssociationId(associationId)) {
// The other dhcp details are from a newer session and so everything must be reset.
this.dhcpServerIp = null;
this.firstDiscoverTimestamp = null;
this.firstOfferTimestamp = null;
this.firstRequestTimestamp = null;
this.gatewayIp = null;
this.leaseStartTimestamp = null;
this.leaseTimeInSeconds = null;
this.primaryDns = null;
this.secondaryDns = null;
this.subnetMask = null;
// set the session Id to the newer session
this.associationId = other.associationId;
this.fromInternal = false;
}
else if(other.associationId != associationId) {
// other is older, ignore it
if(!Objects.equals(this.associationId, other.associationId)) {
return;
}
dhcpServerIp = (InetAddress) assignOtherIfOtherNotNull(dhcpServerIp, other.dhcpServerIp);
@@ -305,4 +171,28 @@ public class ClientDhcpDetails extends BaseJsonModel {
this.fromInternal = fromInternal;
}
@Override
public int hashCode() {
return Objects.hash(associationId, dhcpServerIp, firstDiscoverTimestamp, firstOfferTimestamp, firstRequestTimestamp, fromInternal, gatewayIp,
leaseStartTimestamp, leaseTimeInSeconds, nakTimestamp, primaryDns, secondaryDns, subnetMask);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ClientDhcpDetails other = (ClientDhcpDetails) obj;
return Objects.equals(associationId, other.associationId) && Objects.equals(dhcpServerIp, other.dhcpServerIp)
&& Objects.equals(firstDiscoverTimestamp, other.firstDiscoverTimestamp) && Objects.equals(firstOfferTimestamp, other.firstOfferTimestamp)
&& Objects.equals(firstRequestTimestamp, other.firstRequestTimestamp) && fromInternal == other.fromInternal
&& Objects.equals(gatewayIp, other.gatewayIp) && Objects.equals(leaseStartTimestamp, other.leaseStartTimestamp)
&& Objects.equals(leaseTimeInSeconds, other.leaseTimeInSeconds) && Objects.equals(nakTimestamp, other.nakTimestamp)
&& Objects.equals(primaryDns, other.primaryDns) && Objects.equals(secondaryDns, other.secondaryDns)
&& Objects.equals(subnetMask, other.subnetMask);
}
}

12
client-models/src/main/java/com/telecominfraproject/wlan/client/session/models/ClientSessionDetails.java
View File

@@ -19,7 +19,7 @@ public class ClientSessionDetails extends BaseJsonModel {
private static final long serialVersionUID = -7714023056859882994L;
private long sessionId;
private String sessionId;
private Long authTimestamp;
private Long assocTimestamp;
private Integer assocInternalSC;
@@ -60,16 +60,16 @@ public class ClientSessionDetails extends BaseJsonModel {
private Integer associationStatus;
private Integer dynamicVlan;
private Integer assocRssi;
private Long priorSessionId;
private String priorSessionId;
private Long priorEquipmentId;
private String classificationName;
private AssociationState associationState;
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}
@@ -821,11 +821,11 @@ public class ClientSessionDetails extends BaseJsonModel {
this.assocRssi = assocRssi;
}
public Long getPriorSessionId() {
public String getPriorSessionId() {
return priorSessionId;
}
public void setPriorSessionId(Long priorSessionId) {
public void setPriorSessionId(String priorSessionId) {
this.priorSessionId = priorSessionId;
}

3
client-service/src/main/resources/client-service-openapi.yaml
View File

@@ -147,8 +147,7 @@ components:
type: object
properties:
sessionId:
type: integer
format: int64
type: string
authTimestamp:
type: integer
format: int64

53
cloud-event-dispatcher/src/main/resources/cloud-event-dispatcher-service-openapi.yaml
View File

@@ -662,8 +662,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
customerId:
type: integer
format: int32
@@ -759,8 +758,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -791,8 +789,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
radioType:
$ref: '#/components/schemas/RadioType'
isReassociation:
@@ -844,8 +841,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -860,8 +856,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
macAddressBytes:
type: array
items:
@@ -884,8 +879,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
lastRecvTime:
@@ -902,8 +896,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -934,8 +927,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -971,8 +963,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
firstDataRcvdTs:
@@ -987,8 +978,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
ipAddr:
@@ -1061,8 +1051,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -1104,8 +1093,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
macAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -1147,8 +1135,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1167,8 +1154,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1185,8 +1171,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1555,8 +1540,7 @@ components:
type: object
properties:
sessionId:
type: integer
format: int64
type: string
authTimestamp:
type: integer
format: int64
@@ -5064,9 +5048,8 @@ components:
format: int32
sessionId:
type: integer
format: int64
type: string
classificationName:
type: string

53
portal-services/src/main/resources/portal-services-openapi.yaml
View File

@@ -4347,8 +4347,7 @@ components:
type: object
properties:
sessionId:
type: integer
format: int64
type: string
authTimestamp:
type: integer
format: int64
@@ -5234,9 +5233,8 @@ components:
format: int32
sessionId:
type: integer
format: int64
type: string
classificationName:
type: string
@@ -9783,8 +9781,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
customerId:
type: integer
format: int32
@@ -9916,8 +9913,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -9952,8 +9948,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
radioType:
$ref: '#/components/schemas/RadioType'
isReassociation:
@@ -10009,8 +10004,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -10029,8 +10023,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
macAddressBytes:
type: array
items:
@@ -10057,8 +10050,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
lastRecvTime:
@@ -10079,8 +10071,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -10115,8 +10106,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -10156,8 +10146,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
firstDataRcvdTs:
@@ -10176,8 +10165,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
ipAddr:
@@ -10259,8 +10247,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -10302,8 +10289,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
macAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -10353,8 +10339,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -10377,8 +10362,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -10399,8 +10383,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:

6
service-metric-models/src/main/java/com/telecominfraproject/wlan/servicemetric/client/models/ClientMetrics.java
View File

@@ -42,7 +42,7 @@ public class ClientMetrics extends ServiceMetricDetails {
private Integer vhtMcs;
private Integer snr;
private Integer rssi;
private Long sessionId;
private String sessionId;
private String classificationName;
ChannelBandwidth channelBandWidth;
GuardInterval guardInterval;
@@ -1191,7 +1191,7 @@ public class ClientMetrics extends ServiceMetricDetails {
return rxLastRssi;
}
public Long getSessionId() {
public String getSessionId() {
return sessionId;
}
@@ -1537,7 +1537,7 @@ public class ClientMetrics extends ServiceMetricDetails {
this.rxLastRssi = rxLastRssi;
}
public void setSessionId(Long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

3
service-metric-service/src/main/resources/service-metric-service-openapi.yaml
View File

@@ -270,8 +270,7 @@ components:
format: int32
sessionId:
type: integer
format: int64
type: string
classificationName:
type: string

8
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/BaseDhcpEvent.java
View File

@@ -20,12 +20,12 @@ public abstract class BaseDhcpEvent extends SystemEvent implements HasClientMac,
private InetAddress clientIp;
private InetAddress relayIp;
private MacAddress clientMacAddress;
private long sessionId; // association sessionid
private String sessionId; // association sessionid
private int customerId;
private long equipmentId;
private long locationId;
public BaseDhcpEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId) {
public BaseDhcpEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId) {
super(eventTimestamp);
this.customerId = customerId;
this.locationId = locationId;
@@ -113,11 +113,11 @@ public abstract class BaseDhcpEvent extends SystemEvent implements HasClientMac,
this.relayIp = relayIp;
}
public long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpAckEvent.java
View File

@@ -22,12 +22,12 @@ public class DhcpAckEvent extends BaseDhcpEvent {
*/
private boolean fromInternal = false;
public DhcpAckEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId) {
public DhcpAckEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId) {
super(customerId, locationId, equipmentId, eventTimestamp, sessionId);
}
public DhcpAckEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
public InetAddress getGatewayIp() {

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpDeclineEvent.java
View File

@@ -10,12 +10,12 @@ package com.telecominfraproject.wlan.systemevent.equipment;
public class DhcpDeclineEvent extends BaseDhcpEvent {
private static final long serialVersionUID = -7745659083975485467L;
public DhcpDeclineEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId){
public DhcpDeclineEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId){
super(customerId, locationId, equipmentId,eventTimestamp, sessionId);
}
public DhcpDeclineEvent() {
super(0,0L, 0L,0L,0L);
super(0,0L, 0L,0L,"0");
}
@Override

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpDiscoverEvent.java
View File

@@ -9,12 +9,12 @@ public class DhcpDiscoverEvent extends BaseDhcpEvent {
private static final long serialVersionUID = -8290687227649478971L;
private String hostName;
public DhcpDiscoverEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId){
public DhcpDiscoverEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId){
super(customerId, locationId,equipmentId,eventTimestamp,sessionId);
}
public DhcpDiscoverEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
/**

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpInformEvent.java
View File

@@ -10,12 +10,12 @@ package com.telecominfraproject.wlan.systemevent.equipment;
public class DhcpInformEvent extends BaseDhcpEvent {
private static final long serialVersionUID = 7053813308222200205L;
public DhcpInformEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId){
public DhcpInformEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId){
super(customerId, locationId,equipmentId,eventTimestamp, sessionId);
}
public DhcpInformEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
@Override

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpNakEvent.java
View File

@@ -9,12 +9,12 @@ public class DhcpNakEvent extends BaseDhcpEvent {
private static final long serialVersionUID = -8648265834227002667L;
private boolean fromInternal = false;
public DhcpNakEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId) {
public DhcpNakEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId) {
super(customerId, locationId, equipmentId, eventTimestamp, sessionId);
}
public DhcpNakEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
/**

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpOfferEvent.java
View File

@@ -10,12 +10,12 @@ public class DhcpOfferEvent extends BaseDhcpEvent {
*/
private boolean fromInternal = false;
public DhcpOfferEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId) {
public DhcpOfferEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId) {
super(customerId, locationId, equipmentId, eventTimestamp, sessionId);
}
public DhcpOfferEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
/**

4
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/DhcpRequestEvent.java
View File

@@ -9,12 +9,12 @@ public class DhcpRequestEvent extends BaseDhcpEvent {
private static final long serialVersionUID = 906425685437156761L;
private String hostName;
public DhcpRequestEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, long sessionId){
public DhcpRequestEvent(int customerId, long locationId, long equipmentId, long eventTimestamp, String sessionId){
super(customerId, locationId,equipmentId,eventTimestamp, sessionId);
}
public DhcpRequestEvent() {
super(0, 0L,0L,0L,0L);
super(0, 0L,0L,0L,"0");
}
/**

10
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/realtime/RealTimeSipCallEventWithStats.java
View File

@@ -28,7 +28,7 @@ public abstract class RealTimeSipCallEventWithStats extends RealTimeEvent
private static final long serialVersionUID = -8908272967317508366L;
private Long sipCallId;
private Long associationId;
private String associationId;
private MacAddress clientMacAddress;
private List<RtpFlowStats> statuses;
private int channel;
@@ -49,12 +49,12 @@ public abstract class RealTimeSipCallEventWithStats extends RealTimeEvent
this.sipCallId = sipCallId;
}
public Long getAssociationId() {
public String getAssociationId() {
return associationId;
}
public void setAssociationId(Long associationId) {
this.associationId = associationId;
public void setAssociationId(String string) {
this.associationId = string;
}
@Override
@@ -79,7 +79,7 @@ public abstract class RealTimeSipCallEventWithStats extends RealTimeEvent
}
public boolean hasValidAssociationId() {
return (associationId != null) && (associationId != 0);
return (associationId != null) && (!associationId.equals("0"));
}
public int getChannel() {

8
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/realtime/RealTimeSipCallStartEvent.java
View File

@@ -18,7 +18,7 @@ public class RealTimeSipCallStartEvent extends RealTimeEvent
*/
private static final long serialVersionUID = -7289926906539107435L;
private Long sipCallId;
private Long associationId;
private String associationId;
private MacAddress macAddress;
private List<String> codecs;
private String providerDomain;
@@ -52,7 +52,7 @@ public class RealTimeSipCallStartEvent extends RealTimeEvent
&& Objects.equals(channel, other.channel) && Objects.equals(radioType, other.radioType);
}
public Long getAssociationId() {
public String getAssociationId() {
return associationId;
}
@@ -92,7 +92,7 @@ public class RealTimeSipCallStartEvent extends RealTimeEvent
return result;
}
public void setAssociationId(Long associationId) {
public void setAssociationId(String associationId) {
this.associationId = associationId;
}
@@ -131,7 +131,7 @@ public class RealTimeSipCallStartEvent extends RealTimeEvent
}
public boolean hasValidAssociationId() {
return (associationId != null) && (associationId != 0);
return (associationId != null) && (!associationId.equals("0"));
}
public int getChannel() {

12
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/realtime/RealTimeStreamingStartEvent.java
View File

@@ -13,8 +13,8 @@ public class RealTimeStreamingStartEvent extends RealTimeEvent
implements HasCustomerId, HasEquipmentId, HasClientMac, HasProducedTimestamp {
private static final long serialVersionUID = -591221857158333271L;
private Long videoSessionId;
private Long sessionId;
private String videoSessionId;
private String sessionId;
private MacAddress clientMac;
private InetAddress serverIp;
private String serverDnsName;
@@ -40,19 +40,19 @@ public class RealTimeStreamingStartEvent extends RealTimeEvent
this.serverDnsName = serverDnsName;
}
public Long getVideoSessionId() {
public String getVideoSessionId() {
return videoSessionId;
}
public void setVideoSessionId(Long videoSessionId) {
public void setVideoSessionId(String videoSessionId) {
this.videoSessionId = videoSessionId;
}
public Long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

12
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/realtime/RealTimeStreamingStartSessionEvent.java
View File

@@ -13,8 +13,8 @@ public class RealTimeStreamingStartSessionEvent extends RealTimeEvent
implements HasCustomerId, HasEquipmentId, HasClientMac, HasProducedTimestamp {
private static final long serialVersionUID = 4395850344272425198L;
private Long videoSessionId;
private Long sessionId;
private String videoSessionId;
private String sessionId;
private MacAddress clientMac;
private InetAddress serverIp;
private StreamingVideoType type;
@@ -31,19 +31,19 @@ public class RealTimeStreamingStartSessionEvent extends RealTimeEvent
super(RealTimeEventType.VideoStreamDebugStart, customerId, locationId, equipmentId, eventTimestamp);
}
public Long getVideoSessionId() {
public String getVideoSessionId() {
return videoSessionId;
}
public void setVideoSessionId(Long videoSessionId) {
public void setVideoSessionId(String videoSessionId) {
this.videoSessionId = videoSessionId;
}
public Long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

12
system-event-models/src/main/java/com/telecominfraproject/wlan/systemevent/equipment/realtime/RealTimeStreamingStopEvent.java
View File

@@ -13,8 +13,8 @@ public class RealTimeStreamingStopEvent extends RealTimeEvent
implements HasCustomerId, HasEquipmentId, HasClientMac, HasProducedTimestamp {
private static final long serialVersionUID = 6433913573274597688L;
private Long videoSessionId;
private Long sessionId;
private String videoSessionId;
private String sessionId;
private MacAddress clientMac;
private InetAddress serverIp;
private Long totalBytes;
@@ -33,19 +33,19 @@ public class RealTimeStreamingStopEvent extends RealTimeEvent
super(RealTimeEventType.VideoStreamStop, customerId, locationId, equipmentId, eventTimestamp);
}
public Long getVideoSessionId() {
public String getVideoSessionId() {
return videoSessionId;
}
public void setVideoSessionId(Long videoSessionId) {
public void setVideoSessionId(String videoSessionId) {
this.videoSessionId = videoSessionId;
}
public Long getSessionId() {
public String getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}

48
system-event-service/src/main/resources/system-event-service-openapi.yaml
View File

@@ -679,8 +679,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
customerId:
type: integer
format: int32
@@ -776,8 +775,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -808,8 +806,7 @@ components:
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
sessionId:
type: integer
format: int64
type: string
radioType:
$ref: '#/components/schemas/RadioType'
isReassociation:
@@ -861,8 +858,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -877,8 +873,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
macAddressBytes:
type: array
items:
@@ -901,8 +896,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
lastRecvTime:
@@ -919,8 +913,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -951,8 +944,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
ssid:
type: string
clientMacAddress:
@@ -988,8 +980,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
firstDataRcvdTs:
@@ -1004,8 +995,7 @@ components:
allOf:
$ref: '#/components/schemas/RealTimeEvent'
sessionId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
ipAddr:
@@ -1078,8 +1068,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
clientMacAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -1121,8 +1110,7 @@ components:
type: integer
format: int64
associationId:
type: integer
format: int64
type: string
macAddress:
$ref: '#/components/schemas/MacAddress'
radioType:
@@ -1164,8 +1152,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1184,8 +1171,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1202,8 +1188,7 @@ components:
type: integer
format: int64
sessionId:
type: integer
format: int64
type: string
clientMac:
$ref: '#/components/schemas/MacAddress'
serverIp:
@@ -1569,8 +1554,7 @@ components:
type: object
properties:
sessionId:
type: integer
format: int64
type: string
authTimestamp:
type: integer
format: int64