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

WIFI-1851: Backend: Modelling manufacturing identity data -- get EquipmentManufacturer by manufacturer name, not just enum name

Browse Source
This commit is contained in:
Mike Hansen
2021-03-23 17:40:22 -04:00
parent 1cee28a694
commit acf798bbc9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,7 +606,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSerialNumber(connectNodeInfo.serialNumber);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setQrCode(qrCode);
if (connectNodeInfo.manufacturerName != null) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByName(connectNodeInfo.manufacturerName.toUpperCase()));
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByManufacturer(connectNodeInfo.manufacturerName));
}
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerDate(connectNodeInfo.manufacturerDate);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerUrl(connectNodeInfo.manufacturerUrl);
@@ -1740,8 +1740,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setRevision(node.revision);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSerialNumber(node.serialNumber);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setQrCode(qrCode);
if (node.manufacturerName != null && !node.manufacturerName.equalsIgnoreCase("unknown")) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByName(node.manufacturerName));
if (node.manufacturerName != null ) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByManufacturer(node.manufacturerName));
}
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerDate(node.manufacturerDate);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerUrl(node.manufacturerUrl);