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

Hostname for Client Sessions, Make sure collections initialized in models on instantiation

Browse Source
This commit is contained in:
Mike Hansen
2020-06-30 08:34:22 -04:00
parent dece61257a
commit ccfbeebfc9
6 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1252,7 +1252,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
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<RadioType, EquipmentCapacityDetails> 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());
}
}

10
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java vendored
View File

@@ -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,6 +38,14 @@ public class OpensyncAPInetState extends BaseJsonModel {
public Uuid _uuid;
public Uuid version;
public OpensyncAPInetState() {
super();
dns = new HashMap<>();
dhcpc = new HashMap<>();
}
public String getIfName() {
return ifName;
}

12
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java vendored
View File

@@ -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<String, String> 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;

10
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPVIFState.java vendored
View File

@@ -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;
}

11
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAWLANNode.java vendored
View File

@@ -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<Object, Object> getMqttSettings() {
return mqttSettings;
}

7
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncWifiAssociatedClients.java vendored
View File

@@ -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;
}