scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-03 12:08:07 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-437: CloudSDK Client DHCP attributes processing. -- session updates

Browse Source
This commit is contained in:
Mike Hansen
2020-08-28 16:12:17 -04:00
parent 03c8c15f53
commit 4b7bbaae6e
1 changed files with 96 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -954,6 +954,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
private void processEventReport(Report report, int customerId, long equipmentId, String apId, long locationId) { private void processEventReport(Report report, int customerId, long equipmentId, String apId, long locationId) {
LOG.debug("Processing EventReport List {}", report.getEventReportList());
report.getEventReportList().stream().forEach(e -> { report.getEventReportList().stream().forEach(e -> {
LOG.info("Received EventReport {}", e); LOG.info("Received EventReport {}", e);
@@ -3354,9 +3357,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
for (ClientSession session : clientSessionList) { for (ClientSession session : clientSessionList) {
ClientSessionDetails clientSessionDetails = session.getDetails(); ClientSessionDetails clientSessionDetails = session.getDetails();
if (clientSessionDetails.getAssociationState() != null && !clientSessionDetails.getAssociationState().equals(AssociationState.Disconnected)) { if (clientSessionDetails.getAssociationState() != null
&& !clientSessionDetails.getAssociationState().equals(AssociationState.Disconnected)) {
clientSessionDetails.setDisconnectByClientTimestamp(System.currentTimeMillis()); clientSessionDetails.setDisconnectByClientTimestamp(System.currentTimeMillis());
clientSessionDetails.setAssociationState(AssociationState.Disconnected); clientSessionDetails.setAssociationState(AssociationState.Disconnected);
@@ -3410,6 +3414,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
Equipment ce = getCustomerEquipment(apId);
if (ce == null) {
LOG.debug("updateDhcpIpClientFingerprints::Cannot get Equipment for AP {}", apId);
return;
}
long locationId = ce.getLocationId();
if (rowUpdateOperation.equals(RowUpdateOperation.INSERT)) { if (rowUpdateOperation.equals(RowUpdateOperation.INSERT)) {
@@ -3449,7 +3462,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
// In this case, we might have a session, as the client // In this case, we might have a session, as the client
// already exists on the cloud, update if required // already exists on the cloud, update if required
ClientSession session = updateClientSession(customerId, equipmentId, dhcpLeasedIps, clientMacAddress); ClientSession session = updateClientSession(customerId, equipmentId, locationId, dhcpLeasedIps,
clientMacAddress);
if (session != null) { if (session != null) {
clientSessionList.add(session); clientSessionList.add(session);
@@ -3548,7 +3562,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
// check if there is a session for this client // check if there is a session for this client
ClientSession session = updateClientSession(customerId, equipmentId, dhcpLeasedIps, clientMacAddress); ClientSession session = updateClientSession(customerId, equipmentId, locationId, dhcpLeasedIps,
clientMacAddress);
if (session != null) { if (session != null) {
clientSessionList.add(session); clientSessionList.add(session);
@@ -3570,91 +3585,92 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
} }
protected ClientSession updateClientSession(int customerId, long equipmentId, Map<String, String> dhcpLeasedIps, protected ClientSession updateClientSession(int customerId, long equipmentId, long locationId,
MacAddress clientMacAddress) { Map<String, String> dhcpLeasedIps, MacAddress clientMacAddress) {
ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress); ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress);
if (session == null) { if (session == null) {
session = new ClientSession(); session = new ClientSession();
session.setCustomerId(customerId); }
session.setEquipmentId(equipmentId); session.setCustomerId(customerId);
session.setMacAddress(clientMacAddress); session.setEquipmentId(equipmentId);
session.setDetails(new ClientSessionDetails()); session.setLocationId(locationId);
session.setMacAddress(clientMacAddress);
session.setDetails(new ClientSessionDetails());
ClientSessionDetails clientSessionDetails = new ClientSessionDetails(); ClientSessionDetails clientSessionDetails = new ClientSessionDetails();
if (dhcpLeasedIps.containsKey("fingerprint")) { if (dhcpLeasedIps.containsKey("fingerprint")) {
clientSessionDetails.setApFingerprint(dhcpLeasedIps.get("fingerprint")); clientSessionDetails.setApFingerprint(dhcpLeasedIps.get("fingerprint"));
}
if (dhcpLeasedIps.containsKey("inet_addr")) {
try {
clientSessionDetails.setIpAddress(InetAddress.getByName(dhcpLeasedIps.get("inet_addr")));
} catch (UnknownHostException e) {
LOG.error("Invalid Client IP", e);
} }
if (dhcpLeasedIps.containsKey("inet_addr")) {
try {
clientSessionDetails.setIpAddress(InetAddress.getByName(dhcpLeasedIps.get("inet_addr")));
} catch (UnknownHostException e) {
LOG.error("Invalid Client IP", e);
}
}
if (dhcpLeasedIps.containsKey("hostname")) {
clientSessionDetails.setHostname(dhcpLeasedIps.get("hostname"));
}
ClientDhcpDetails clientDhcpDetails = new ClientDhcpDetails(clientSessionDetails.getSessionId());
if (dhcpLeasedIps.containsKey("lease_time")) {
Integer leaseTime = Integer.valueOf(dhcpLeasedIps.get("lease_time"));
clientDhcpDetails.setLeaseTimeInSeconds(leaseTime / 1000);
}
if (dhcpLeasedIps.containsKey("gateway")) {
try {
clientDhcpDetails.setGatewayIp(InetAddress.getByName(dhcpLeasedIps.get("gateway")));
} catch (UnknownHostException e) {
LOG.error("Invalid Gateway IP", e);
}
}
if (dhcpLeasedIps.containsKey("subnet_mask")) {
try {
clientDhcpDetails.setSubnetMask(InetAddress.getByName(dhcpLeasedIps.get("subnet_mask")));
} catch (UnknownHostException e) {
LOG.error("Invalid Subnet Mask", e);
}
}
if (dhcpLeasedIps.containsKey("primary_dns")) {
try {
clientDhcpDetails.setPrimaryDns(InetAddress.getByName(dhcpLeasedIps.get("primary_dns")));
} catch (UnknownHostException e) {
LOG.error("Invalid Primary DNS", e);
}
}
if (dhcpLeasedIps.containsKey("secondary_dns")) {
try {
clientDhcpDetails.setSecondaryDns(InetAddress.getByName(dhcpLeasedIps.get("secondary_dns")));
} catch (UnknownHostException e) {
LOG.error("Invalid Secondary DNS", e);
}
}
clientSessionDetails.setDhcpDetails(clientDhcpDetails);
session.getDetails().mergeSession(clientSessionDetails);
} }
if (dhcpLeasedIps.containsKey("hostname")) {
clientSessionDetails.setHostname(dhcpLeasedIps.get("hostname"));
}
ClientDhcpDetails clientDhcpDetails = new ClientDhcpDetails(clientSessionDetails.getSessionId());
if (dhcpLeasedIps.containsKey("lease_time")) {
Integer leaseTime = Integer.valueOf(dhcpLeasedIps.get("lease_time"));
clientDhcpDetails.setLeaseTimeInSeconds(leaseTime / 1000);
}
if (dhcpLeasedIps.containsKey("gateway")) {
try {
clientDhcpDetails.setGatewayIp(InetAddress.getByName(dhcpLeasedIps.get("gateway")));
} catch (UnknownHostException e) {
LOG.error("Invalid Gateway IP", e);
}
}
if (dhcpLeasedIps.containsKey("subnet_mask")) {
try {
clientDhcpDetails.setSubnetMask(InetAddress.getByName(dhcpLeasedIps.get("subnet_mask")));
} catch (UnknownHostException e) {
LOG.error("Invalid Subnet Mask", e);
}
}
if (dhcpLeasedIps.containsKey("primary_dns")) {
try {
clientDhcpDetails.setPrimaryDns(InetAddress.getByName(dhcpLeasedIps.get("primary_dns")));
} catch (UnknownHostException e) {
LOG.error("Invalid Primary DNS", e);
}
}
if (dhcpLeasedIps.containsKey("secondary_dns")) {
try {
clientDhcpDetails.setSecondaryDns(InetAddress.getByName(dhcpLeasedIps.get("secondary_dns")));
} catch (UnknownHostException e) {
LOG.error("Invalid Secondary DNS", e);
}
}
clientSessionDetails.setDhcpDetails(clientDhcpDetails);
session.getDetails().mergeSession(clientSessionDetails);
return session; return session;
} }