From ccfbeebfc989717eef9f65d21ee140c15f336b10 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Tue, 30 Jun 2020 08:34:22 -0400 Subject: [PATCH] Hostname for Client Sessions, Make sure collections initialized in models on instantiation --- .../OpensyncExternalIntegrationCloud.java | 12 +++++++----- .../integration/models/OpensyncAPInetState.java | 12 ++++++++++-- .../integration/models/OpensyncAPRadioState.java | 12 ++++++++++++ .../integration/models/OpensyncAPVIFState.java | 10 +++++++++- .../integration/models/OpensyncAWLANNode.java | 11 ++++++++++- .../models/OpensyncWifiAssociatedClients.java | 7 ++++++- 6 files changed, 54 insertions(+), 10 deletions(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 7c5b5ef..fa48b21 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -1250,9 +1250,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra clientInstance.setMacAddress(new MacAddress(client.getMacAddress())); clientInstance.setDetails(new ClientInfoDetails()); clientInstance = clientServiceInterface.create(clientInstance); - } + } ClientInfoDetails clientDetails = (ClientInfoDetails) clientInstance.getDetails(); - clientDetails.setHostName(nodeId); + clientDetails.setHostName(apId); clientInstance.setDetails(clientDetails); clientInstance = clientServiceInterface.update(clientInstance); } @@ -1294,7 +1294,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra clientSessionDetails.setAssociationStatus(0); clientSessionDetails.setLastRxTimestamp(timestamp); - clientSessionDetails.setHostname(bssidAddress.getAddressAsString()); + clientSessionDetails.setHostname(apId); clientSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(client)); clientSession.setDetails(clientSessionDetails); @@ -1938,7 +1938,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra Map capacityDetails = radioUtilizationReport.getCapacityDetails(); if (!capacityDetails.containsKey(radioFreqBand)) { - capacityDetails.put(radioFreqBand, new EquipmentCapacityDetails()); + EquipmentCapacityDetails details = new EquipmentCapacityDetails(); + details.setTotalCapacity(100); + capacityDetails.put(radioFreqBand, details); radioUtilizationReport.setCapacityDetails(capacityDetails); } @@ -1977,7 +1979,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra } for (OpensyncAPInetState inetState : inetStateTables) { - // TODO: implement me + LOG.info("Received InetState table update {}", inetState.toPrettyString()); } } diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java index 99b6d8a..2779d2e 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java @@ -1,7 +1,7 @@ package com.telecominfraproject.wlan.opensync.external.integration.models; +import java.util.HashMap; import java.util.Map; -import java.util.UUID; import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; import com.vmware.ovsdb.protocol.operation.notation.Uuid; @@ -38,7 +38,15 @@ public class OpensyncAPInetState extends BaseJsonModel { public Uuid _uuid; public Uuid version; - public String getIfName() { + + + + public OpensyncAPInetState() { + super(); + dns = new HashMap<>(); + dhcpc = new HashMap<>(); + } + public String getIfName() { return ifName; } public void setIfName(String ifName) { diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java index de34a62..519f24b 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java @@ -3,6 +3,8 @@ */ package com.telecominfraproject.wlan.opensync.external.integration.models; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -44,6 +46,16 @@ public class OpensyncAPRadioState extends BaseJsonModel { public Map hwParams; public RadioType freqBand; public int thermalIntegration; + + + public OpensyncAPRadioState() { + super(); + allowedChannels = new HashSet<>(); + hwConfig = new HashMap<>(); + channels = new HashMap<>(); + hwParams = new HashMap<>(); + } + public String channelMode; public Uuid _uuid; public Uuid version; diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPVIFState.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPVIFState.java index 9894ea4..b0c3f2d 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPVIFState.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPVIFState.java @@ -1,8 +1,9 @@ package com.telecominfraproject.wlan.opensync.external.integration.models; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.UUID; import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; import com.vmware.ovsdb.protocol.operation.notation.Uuid; @@ -43,6 +44,13 @@ public class OpensyncAPVIFState extends BaseJsonModel { return ifName; } + public OpensyncAPVIFState() { + super(); + security = new HashMap<>(); + associatedClients = new HashSet<>(); + + } + public void setIfName(String ifName) { this.ifName = ifName; } diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java index f07f25a..22b2890 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java @@ -3,8 +3,8 @@ */ package com.telecominfraproject.wlan.opensync.external.integration.models; +import java.util.HashMap; import java.util.Map; -import java.util.UUID; import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; import com.vmware.ovsdb.protocol.operation.notation.Uuid; @@ -43,6 +43,15 @@ public class OpensyncAWLANNode extends BaseJsonModel { public Uuid _uuid; public Uuid version; + public OpensyncAWLANNode() { + super(); + mqttSettings = new HashMap<>(); + versionMatrix = new HashMap<>(); + ledConfig = new HashMap<>(); + mqttHeaders = new HashMap<>(); + mqttTopics = new HashMap<>(); + } + public Map getMqttSettings() { return mqttSettings; } diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncWifiAssociatedClients.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncWifiAssociatedClients.java index 90ac849..a80a7bd 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncWifiAssociatedClients.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncWifiAssociatedClients.java @@ -3,8 +3,8 @@ */ package com.telecominfraproject.wlan.opensync.external.integration.models; +import java.util.HashSet; import java.util.Set; -import java.util.UUID; import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; import com.vmware.ovsdb.protocol.operation.notation.Uuid; @@ -27,6 +27,11 @@ public class OpensyncWifiAssociatedClients extends BaseJsonModel { public Uuid _uuid; public Uuid version; + public OpensyncWifiAssociatedClients() { + super(); + capabilities = new HashSet<>(); + } + public String getKeyId() { return keyId; }