scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-31 18:47:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-1851: Backend: Modelling manufacturing identity data -- disable functions pending AP load availability

Browse Source
This commit is contained in:
Mike Hansen
2021-03-24 13:41:21 -04:00
parent acf798bbc9
commit 9607124360
1 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,56 +572,58 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
statusRecord.setDetails(protocolStatusData);
Status protocolStatus = statusServiceInterface.update(statusRecord);
LOG.debug("ProtocolStatus for AP {} updated to {}", ce.getName(), protocolStatus);
statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.EQUIPMENT_MANUFACTURER_DATA);
if (statusRecord == null) {
statusRecord = new Status();
statusRecord.setCustomerId(ce.getCustomerId());
statusRecord.setEquipmentId(ce.getId());
statusRecord.setStatusDataType(StatusDataType.EQUIPMENT_MANUFACTURER_DATA);
EquipmentManufacturerDataStatus statusData = new EquipmentManufacturerDataStatus();
statusRecord.setDetails(statusData);
}
EquipmentManufacturerQrCode qrCode = new EquipmentManufacturerQrCode();
if (connectNodeInfo.qrCode != null) {
if (connectNodeInfo.qrCode.get("DT") != null) {
qrCode.setDeviceType(EquipmentType.getByName(connectNodeInfo.qrCode.get("DT")));
}
if (connectNodeInfo.qrCode.get("VN") != null) {
qrCode.setVendorName(connectNodeInfo.qrCode.get("VN").toUpperCase());
}
if (connectNodeInfo.qrCode.get("DM") != null) {
qrCode.setDeviceMac(MacAddress.valueOf(connectNodeInfo.qrCode.get("DM")));
}
qrCode.setHwRevision(connectNodeInfo.qrCode.get("HW"));
qrCode.setModelName(connectNodeInfo.qrCode.get("MN"));
qrCode.setSerialNumber(connectNodeInfo.qrCode.get("SN"));
}
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSkuNumber(connectNodeInfo.skuNumber);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setModel(connectNodeInfo.model);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setRevision(connectNodeInfo.revision);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSerialNumber(connectNodeInfo.serialNumber);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setQrCode(qrCode);
if (connectNodeInfo.manufacturerName != null) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByManufacturer(connectNodeInfo.manufacturerName));
}
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerDate(connectNodeInfo.manufacturerDate);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerUrl(connectNodeInfo.manufacturerUrl);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setModelDescription(connectNodeInfo.modelDescription);
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setReferenceDesign(connectNodeInfo.referenceDesign);
if (connectNodeInfo.certificationRegion != null && !connectNodeInfo.certificationRegion.equalsIgnoreCase("unknown")) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setCertificationRegion(
CountryCode.getByName(connectNodeInfo.certificationRegion.toUpperCase()));
}
if (connectNodeInfo.macAddress != null && !connectNodeInfo.macAddress.equalsIgnoreCase("unknown")) {
((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
}
Status manufacturerStatus = statusServiceInterface.update(statusRecord);
LOG.debug("EQUIPMENT_MANUFACTURER_DATA for AP {} updated to {}", ce.getName(), manufacturerStatus);
//
// TODO: enable when AP supports in load
//
// statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.EQUIPMENT_MANUFACTURER_DATA);
// if (statusRecord == null) {
// statusRecord = new Status();
// statusRecord.setCustomerId(ce.getCustomerId());
// statusRecord.setEquipmentId(ce.getId());
// statusRecord.setStatusDataType(StatusDataType.EQUIPMENT_MANUFACTURER_DATA);
// EquipmentManufacturerDataStatus statusData = new EquipmentManufacturerDataStatus();
// statusRecord.setDetails(statusData);
// }
//
// EquipmentManufacturerQrCode qrCode = new EquipmentManufacturerQrCode();
//
// if (connectNodeInfo.qrCode != null) {
// if (connectNodeInfo.qrCode.get("DT") != null) {
// qrCode.setDeviceType(EquipmentType.getByName(connectNodeInfo.qrCode.get("DT")));
// }
// if (connectNodeInfo.qrCode.get("VN") != null) {
// qrCode.setVendorName(connectNodeInfo.qrCode.get("VN").toUpperCase());
// }
// if (connectNodeInfo.qrCode.get("DM") != null) {
// qrCode.setDeviceMac(MacAddress.valueOf(connectNodeInfo.qrCode.get("DM")));
// }
// qrCode.setHwRevision(connectNodeInfo.qrCode.get("HW"));
// qrCode.setModelName(connectNodeInfo.qrCode.get("MN"));
// qrCode.setSerialNumber(connectNodeInfo.qrCode.get("SN"));
// }
//
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSkuNumber(connectNodeInfo.skuNumber);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setModel(connectNodeInfo.model);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setRevision(connectNodeInfo.revision);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setSerialNumber(connectNodeInfo.serialNumber);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setQrCode(qrCode);
// if (connectNodeInfo.manufacturerName != null) {
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setEquipmentManufacturer(EquipmentManufacturer.getByManufacturer(connectNodeInfo.manufacturerName));
// }
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerDate(connectNodeInfo.manufacturerDate);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setManufacturerUrl(connectNodeInfo.manufacturerUrl);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setModelDescription(connectNodeInfo.modelDescription);
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setReferenceDesign(connectNodeInfo.referenceDesign);
// if (connectNodeInfo.certificationRegion != null && !connectNodeInfo.certificationRegion.equalsIgnoreCase("unknown")) {
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setCertificationRegion(
// CountryCode.getByName(connectNodeInfo.certificationRegion.toUpperCase()));
// }
// if (connectNodeInfo.macAddress != null && !connectNodeInfo.macAddress.equalsIgnoreCase("unknown")) {
// ((EquipmentManufacturerDataStatus) statusRecord.getDetails()).setMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
// }
//
// Status manufacturerStatus = statusServiceInterface.update(statusRecord);
// LOG.debug("EQUIPMENT_MANUFACTURER_DATA for AP {} updated to {}", ce.getName(), manufacturerStatus);
statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.FIRMWARE);
if (statusRecord == null) {
@@ -1693,11 +1695,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
if (protocolStatus != null) {
updates.add(protocolStatus);
}
Status manufacturerData = configureManufacturerDetailsStatus(node, customerId, equipmentId);
if (manufacturerData != null) {
updates.add(manufacturerData);
}
// TODO: this should be turned on after the AP has a load with the new mappings
// Status manufacturerData = configureManufacturerDetailsStatus(node, customerId, equipmentId);
// if (manufacturerData != null) {
// updates.add(manufacturerData);
// }
Status firmwareStatus =
configureFirmwareStatus(customerId, equipmentId, fwUpgradeState, fwUpgradeFailureReason, reportedFwImageName, reportedAltFwImageName);