WIFI-1848: Gateway: Support new AWLAN_Node columns for manufacturing identity data

WIFI-1849: Gateway: Update status with additional manufacturing data

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java

@@ -1,3 +1,4 @@
+
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.HashMap;
@@ -26,6 +27,13 @@ public class ConnectNodeInfo implements Cloneable {
     public String lanIfName;
     public String lanIfType;
     public String lanMacAddress;
+    public String referenceDesign;
+    public Map<String, String> qrCode;
+    public String modelDescription;
+    public String manufacturerUrl;
+    public String manufacturerName;
+    public String manufacturerDate;
+    public String certificationRegion;
 
     @Override
     public ConnectNodeInfo clone() {
@@ -40,6 +48,9 @@ public class ConnectNodeInfo implements Cloneable {
             if (this.versionMatrix != null) {
                 ret.versionMatrix = new HashMap<>(this.versionMatrix);
             }
+            if (this.qrCode != null) {
+                ret.qrCode = new HashMap<>(this.qrCode);
+            }
             return ret;
         } catch (CloneNotSupportedException e) {
             throw new IllegalStateException("Cannot clone ", e);
@@ -47,44 +58,45 @@ public class ConnectNodeInfo implements Cloneable {
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof ConnectNodeInfo)) {
-            return false;
-        }
-        ConnectNodeInfo other = (ConnectNodeInfo) obj;
-        return Objects.equals(country, other.country) && Objects.equals(firmwareVersion, other.firmwareVersion)
-                && Objects.equals(ifName, other.ifName) && Objects.equals(ifType, other.ifType)
-                && Objects.equals(ipV4Address, other.ipV4Address) && Objects.equals(lanIfName, other.lanIfName)
-                && Objects.equals(lanIfType, other.lanIfType) && Objects.equals(lanIpV4Address, other.lanIpV4Address)
-                && Objects.equals(lanMacAddress, other.lanMacAddress) && Objects.equals(macAddress, other.macAddress)
-                && Objects.equals(managerAddr, other.managerAddr) && Objects.equals(model, other.model)
-                && Objects.equals(mqttSettings, other.mqttSettings)
-                && Objects.equals(platformVersion, other.platformVersion)
-                && Objects.equals(redirectorAddr, other.redirectorAddr) && Objects.equals(revision, other.revision)
-                && Objects.equals(serialNumber, other.serialNumber) && Objects.equals(skuNumber, other.skuNumber)
-                && Objects.equals(versionMatrix, other.versionMatrix)
-                && Objects.equals(wifiRadioStates, other.wifiRadioStates);
+    public int hashCode() {
+        return Objects.hash(certificationRegion, country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address, lanMacAddress,
+                macAddress, managerAddr, manufacturerDate, manufacturerName, manufacturerUrl, model, modelDescription, mqttSettings, platformVersion, qrCode,
+                redirectorAddr, referenceDesign, revision, serialNumber, skuNumber, versionMatrix, wifiRadioStates);
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hash(country, firmwareVersion, ifName, ifType, ipV4Address, lanIfName, lanIfType, lanIpV4Address,
-                lanMacAddress, macAddress, managerAddr, model, mqttSettings, platformVersion, redirectorAddr, revision,
-                serialNumber, skuNumber, versionMatrix, wifiRadioStates);
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ConnectNodeInfo other = (ConnectNodeInfo) obj;
+        return Objects.equals(certificationRegion, other.certificationRegion) && Objects.equals(country, other.country)
+                && Objects.equals(firmwareVersion, other.firmwareVersion) && Objects.equals(ifName, other.ifName) && Objects.equals(ifType, other.ifType)
+                && Objects.equals(ipV4Address, other.ipV4Address) && Objects.equals(lanIfName, other.lanIfName) && Objects.equals(lanIfType, other.lanIfType)
+                && Objects.equals(lanIpV4Address, other.lanIpV4Address) && Objects.equals(lanMacAddress, other.lanMacAddress)
+                && Objects.equals(macAddress, other.macAddress) && Objects.equals(managerAddr, other.managerAddr)
+                && Objects.equals(manufacturerDate, other.manufacturerDate) && Objects.equals(manufacturerName, other.manufacturerName)
+                && Objects.equals(manufacturerUrl, other.manufacturerUrl) && Objects.equals(model, other.model)
+                && Objects.equals(modelDescription, other.modelDescription) && Objects.equals(mqttSettings, other.mqttSettings)
+                && Objects.equals(platformVersion, other.platformVersion) && Objects.equals(qrCode, other.qrCode)
+                && Objects.equals(redirectorAddr, other.redirectorAddr) && Objects.equals(referenceDesign, other.referenceDesign)
+                && Objects.equals(revision, other.revision) && Objects.equals(serialNumber, other.serialNumber) && Objects.equals(skuNumber, other.skuNumber)
+                && Objects.equals(versionMatrix, other.versionMatrix) && Objects.equals(wifiRadioStates, other.wifiRadioStates);
     }
 
     @Override
     public String toString() {
-        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix
-                + ", wifiRadioStates=" + wifiRadioStates + ", redirectorAddr=" + redirectorAddr + ", managerAddr="
-                + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber + ", macAddress="
-                + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion
-                + ", firmwareVersion=" + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName="
-                + ifName + ", ifType=" + ifType + ", country=" + country + ", lanIpV4Address=" + lanIpV4Address
-                + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress + "]";
+        return "ConnectNodeInfo [mqttSettings=" + mqttSettings + ", versionMatrix=" + versionMatrix + ", wifiRadioStates=" + wifiRadioStates
+                + ", redirectorAddr=" + redirectorAddr + ", managerAddr=" + managerAddr + ", skuNumber=" + skuNumber + ", serialNumber=" + serialNumber
+                + ", macAddress=" + macAddress + ", ipV4Address=" + ipV4Address + ", platformVersion=" + platformVersion + ", firmwareVersion="
+                + firmwareVersion + ", revision=" + revision + ", model=" + model + ", ifName=" + ifName + ", ifType=" + ifType + ", country=" + country
+                + ", lanIpV4Address=" + lanIpV4Address + ", lanIfName=" + lanIfName + ", lanIfType=" + lanIfType + ", lanMacAddress=" + lanMacAddress
+                + ", referenceDesign=" + referenceDesign + ", qrCode=" + qrCode + ", modelDescription=" + modelDescription + ", manufacturerUrl="
+                + manufacturerUrl + ", manufacturerName=" + manufacturerName + ", manufacturerDate=" + manufacturerDate + ", certificationRegion="
+                + certificationRegion + "]";
     }
 
 }

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

@@ -1,6 +1,7 @@
 /**
  *
  */
+
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.HashMap;
@@ -45,6 +46,14 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
     public String revision;
     public String managerAddr;
     public boolean factoryReset;
+    public String referenceDesign;
+    public Map<String, String> qrCode;
+    public String modelDescription;
+    public String manufacturerUrl;
+    public String manufacturerName;
+    public String manufacturerDate;
+    public String certificationRegion;
+
     public Uuid _uuid;
 
     public Uuid version;
@@ -60,7 +69,6 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
     public OpensyncAWLANNode(Row row) {
         this();
         Map<String, Value> map = row.getColumns();
-
         if (map.get("mqtt_settings") != null) {
             this.setMqttSettings(row.getMapColumn("mqtt_settings"));
         }
@@ -70,93 +78,89 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
         if (map.get("mqtt_topics") != null) {
             this.setMqttHeaders(row.getMapColumn("mqtt_topics"));
         }
-
-        if ((map.get("model") != null)
-                && map.get("model").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("model") != null) && map.get("model").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setModel(row.getStringColumn("model"));
         }
-        if ((map.get("sku_number") != null)
-                && map.get("sku_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("sku_number") != null) && map.get("sku_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setSkuNumber(row.getStringColumn("sku_number"));
         }
-        if ((map.get("id") != null)
-                && map.get("id").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
-            this.setId(row.getStringColumn("id"));
+        if (map.get("id") != null) {
+            this.setId(getSingleValueFromSet(row, "id"));
+        }
+        if (map.get("reference_design") != null) {
+            this.setReferenceDesign(getSingleValueFromSet(row, "reference_design"));
+        }
+        if (map.get("qr_code") != null) {
+            this.setQrCode(row.getMapColumn("qr_code"));
+        }
+        if ((map.get("model_description") != null)) {
+            this.setModelDescription(getSingleValueFromSet(row, "model_description"));
+        }
+        if ((map.get("manufacturer_url") != null)) {
+            this.setManufacturerUrl(getSingleValueFromSet(row, "manufacturer_url"));
+        }
+        if ((map.get("manufacturer_name") != null)) {
+            this.setManufacturerName(getSingleValueFromSet(row, "manufacturer_name"));
+        }
+        if ((map.get("manufacturer_date") != null)) {
+            this.setManufacturerDate(getSingleValueFromSet(row, "manufacturer_date"));
+        }
+        if (map.get("certification_region") != null) {
+            this.setCertificationRegion(getSingleValueFromSet(row, "certification_region"));
         }
-
         if (map.get("version_matrix") != null) {
             this.setVersionMatrix(row.getMapColumn("version_matrix"));
         }
-        if ((map.get("firmware_version") != null) && map.get("firmware_version").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_version") != null) && map.get("firmware_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwareVersion(row.getStringColumn("firmware_version"));
         }
-        if ((map.get("firmware_url") != null)
-                && map.get("firmware_url").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_url") != null) && map.get("firmware_url").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwareUrl(row.getStringColumn("firmware_url"));
         }
-
-        if ((map.get("_uuid") != null)
-                && map.get("_uuid").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("_uuid") != null) && map.get("_uuid").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setVersion(row.getUuidColumn("_uuid"));
         }
-        if ((map.get("upgrade_dl_timer") != null) && map.get("upgrade_dl_timer").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("upgrade_dl_timer") != null) && map.get("upgrade_dl_timer").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setUpgradeDlTimer(row.getIntegerColumn("upgrade_dl_timer").intValue());
         }
-        if ((map.get("platform_version") != null) && map.get("platform_version").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("platform_version") != null) && map.get("platform_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setPlatformVersion(row.getStringColumn("platform_version"));
         }
-        if ((map.get("firmware_pass") != null) && map.get("firmware_pass").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("firmware_pass") != null) && map.get("firmware_pass").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFirmwarePass(row.getStringColumn("firmware_pass"));
         }
-        if ((map.get("upgrade_timer") != null) && map.get("upgrade_timer").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("upgrade_timer") != null) && map.get("upgrade_timer").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setUpgradeTimer(row.getIntegerColumn("upgrade_timer").intValue());
         }
-        if ((map.get("max_backoff") != null)
-                && map.get("max_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("max_backoff") != null) && map.get("max_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setMaxBackoff(row.getIntegerColumn("max_backoff").intValue());
         }
         if (map.get("led_config") != null) {
             this.setLedConfig(row.getMapColumn("led_config"));
         }
-        if ((map.get("redirector_addr") != null) && map.get("redirector_addr").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("redirector_addr") != null) && map.get("redirector_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setRedirectorAddr(row.getStringColumn("redirector_addr"));
         }
-        if ((map.get("serial_number") != null) && map.get("serial_number").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("serial_number") != null) && map.get("serial_number").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setSerialNumber(row.getStringColumn("serial_number"));
         }
-        if ((map.get("_version") != null)
-                && map.get("_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("_version") != null) && map.get("_version").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setVersion(row.getUuidColumn("_version"));
         }
-
         this.setUpgradeStatus(row.getIntegerColumn("upgrade_status").intValue());
-
-        if ((map.get("device_mode") != null)
-                && map.get("device_mode").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("device_mode") != null) && map.get("device_mode").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setDeviceMode(row.getStringColumn("device_mode"));
         }
-        if ((map.get("min_backoff") != null)
-                && map.get("min_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("min_backoff") != null) && map.get("min_backoff").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setMinBackoff(row.getIntegerColumn("min_backoff").intValue());
         }
-
-        if ((map.get("revision") != null)
-                && map.get("revision").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("revision") != null) && map.get("revision").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setRevision(row.getStringColumn("revision"));
         }
-        if ((map.get("manager_addr") != null)
-                && map.get("manager_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("manager_addr") != null) && map.get("manager_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setManagerAddr(row.getStringColumn("manager_addr"));
         }
-        if ((map.get("factory_reset") != null) && map.get("factory_reset").getClass()
-                .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
+        if ((map.get("factory_reset") != null) && map.get("factory_reset").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
             this.setFactoryReset(row.getBooleanColumn("factory_reset"));
         }
     }
@@ -261,6 +265,62 @@ public class OpensyncAWLANNode extends OpensyncAPBase {
         return factoryReset;
     }
 
+    public String getReferenceDesign() {
+        return referenceDesign;
+    }
+
+    public void setReferenceDesign(String referenceDesign) {
+        this.referenceDesign = referenceDesign;
+    }
+
+    public Map<String, String> getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(Map<String, String> qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getModelDescription() {
+        return modelDescription;
+    }
+
+    public void setModelDescription(String modelDescription) {
+        this.modelDescription = modelDescription;
+    }
+
+    public String getManufacturerUrl() {
+        return manufacturerUrl;
+    }
+
+    public void setManufacturerUrl(String manufacturerUrl) {
+        this.manufacturerUrl = manufacturerUrl;
+    }
+
+    public String getManufacturerName() {
+        return manufacturerName;
+    }
+
+    public void setManufacturerName(String manufacturerName) {
+        this.manufacturerName = manufacturerName;
+    }
+
+    public String getManufacturerDate() {
+        return manufacturerDate;
+    }
+
+    public void setManufacturerDate(String manufacturerDate) {
+        this.manufacturerDate = manufacturerDate;
+    }
+
+    public String getCertificationRegion() {
+        return certificationRegion;
+    }
+
+    public void setCertificationRegion(String certificationRegion) {
+        this.certificationRegion = certificationRegion;
+    }
+
     public void set_uuid(Uuid _uuid) {
         this._uuid = _uuid;
     }