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

WIFI-1916: Gateway: align sku_number formats to match AP Manufacturing Data desired format

Browse Source
This commit is contained in:
Mike Hansen
2021-03-30 12:23:17 -04:00
parent cfa8c7e039
commit ee4cf9ff59
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNode.java
View File

@@ -351,9 +351,27 @@ public class OvsdbNode extends OvsdbDaoBase {
// updateColumns.put("device_mode", new Atom<String>("cloud") );
// update sku_number if it was empty
if ((ret.skuNumber == null) || ret.skuNumber.isEmpty()) {
ret.skuNumber = "tip.wlan_" + ret.serialNumber;
updateColumns.put("sku_number", new Atom<>(ret.skuNumber));
if (( ret.skuNumber == null) || ret.skuNumber.isEmpty() || ret.skuNumber.equals("unknown") || ret.skuNumber.startsWith("tip.wlan_")) {
if ((ret.certificationRegion != null && !ret.certificationRegion.equals("unknown") ) && (ret.model != null && !ret.model.equals("unknown"))) {
if (ret.model.endsWith("-" + ret.certificationRegion)) {
updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
ret.skuNumber = "TIP-" + ret.model;
} else {
updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model + "-" + ret.certificationRegion));
ret.skuNumber = "TIP-" + ret.model + "-" + ret.certificationRegion;
}
} else if ((ret.country != null ) && (ret.model != null && !ret.model.equals("unknown"))) {
if (ret.model.endsWith("-" + ret.country)) {
updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
ret.skuNumber = "TIP-" + ret.model;
} else {
updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model + "-" + ret.country));
ret.skuNumber = "TIP-" + ret.model + "-" + ret.country;
}
} else if (ret.model != null && !ret.model.equals("unknown")){
updateColumns.put("sku_number", new Atom<>("TIP-" + ret.model));
ret.skuNumber = "TIP-" + ret.model;
}
}
// Configure the MQTT connection

3
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNodeTest.java
View File

@@ -112,6 +112,7 @@ public class OvsdbNodeTest {
connectNodeInfo.lanIfName = "lan";
connectNodeInfo.lanIfType = "bridge";
connectNodeInfo.serialNumber = "0123456789";
connectNodeInfo.model = "EA8300-CA";
Map<String, String> newMqttSettings = new HashMap<>();
newMqttSettings.put("broker", ovsdbNode.mqttBrokerAddress);
@@ -126,7 +127,7 @@ public class OvsdbNodeTest {
ConnectNodeInfo newConnectNodeInfo = ovsdbNode.updateConnectNodeInfoOnConnect(ovsdbClient, "AP-1",
connectNodeInfo, false);
assert (connectNodeInfo.ifName.equals(newConnectNodeInfo.ifName));
assert (newConnectNodeInfo.skuNumber.equals("tip.wlan_" + connectNodeInfo.serialNumber));
assert (newConnectNodeInfo.skuNumber.equals("TIP-" + connectNodeInfo.model));
assert (newConnectNodeInfo.mqttSettings.equals(newMqttSettings));
}