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

WIFI-1658 update based on review comments

Browse Source
This commit is contained in:
Lynn Shi
2021-02-25 11:55:29 -05:00
parent 738d11b11c
commit 7d785e3a10
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,19 +647,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
networkAdminStatusRec = statusServiceInterface.update(networkAdminStatusRec); networkAdminStatusRec = statusServiceInterface.update(networkAdminStatusRec);
Status channelStatusRec = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(),
StatusDataType.RADIO_CHANNEL);
if (channelStatusRec == null) {
channelStatusRec = new Status();
channelStatusRec.setCustomerId(ce.getCustomerId());
channelStatusRec.setEquipmentId(ce.getId());
channelStatusRec.setStatusDataType(StatusDataType.RADIO_CHANNEL);
EquipmentChannelStatusData channelStatusData = new EquipmentChannelStatusData();
channelStatusRec.setDetails(channelStatusData);
channelStatusRec = statusServiceInterface.update(channelStatusRec);
}
} catch (Exception e) { } catch (Exception e) {
LOG.error("Exception in updateApStatus", e); LOG.error("Exception in updateApStatus", e);
throw e; throw e;
@@ -1223,7 +1210,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
Status protocolStatus = null; Status protocolStatus = null;
Status channelStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.RADIO_CHANNEL); Status channelStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.RADIO_CHANNEL);
Status channelStatusClone = channelStatus.clone(); Status channelStatusClone = null;
if (channelStatus != null) {
channelStatusClone = channelStatus.clone();
}
for (OpensyncAPRadioState radioState : radioStateTables) { for (OpensyncAPRadioState radioState : radioStateTables) {
LOG.debug("Processing Wifi_Radio_State table update for AP {} Radio {}", apId, radioState.freqBand); LOG.debug("Processing Wifi_Radio_State table update for AP {} Radio {}", apId, radioState.freqBand);
@@ -1237,15 +1227,16 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
protocolStatus = updateProtocolStatus(customerId, equipmentId, radioState); protocolStatus = updateProtocolStatus(customerId, equipmentId, radioState);
updateChannelStatus(channelStatus, radioState); channelStatus = updateChannelStatus(customerId, equipmentId, channelStatus, radioState);
} }
if (protocolStatus != null) { if (protocolStatus != null) {
statusServiceInterface.update(protocolStatus); statusServiceInterface.update(protocolStatus);
} }
if (!Objects.equals(channelStatus, channelStatusClone)) { if (channelStatus != null && !Objects.equals(channelStatus, channelStatusClone)) {
LOG.debug("update Channel Status before {} after {}", channelStatusClone, channelStatus); LOG.debug("wifiRadioStatusDbTableUpdate update Channel Status before {} after {}",
channelStatusClone, channelStatus);
statusServiceInterface.update(channelStatus); statusServiceInterface.update(channelStatus);
} }
@@ -1300,11 +1291,18 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
return protocolStatus; return protocolStatus;
} }
private void updateChannelStatus(Status channelStatus, OpensyncAPRadioState radioState) { private Status updateChannelStatus(int customerId, long equipmentId, Status channelStatus, OpensyncAPRadioState radioState) {
if (channelStatus != null && channelStatus.getDetails() != null) { if (channelStatus == null) {
((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put( channelStatus = new Status();
radioState.getFreqBand(), radioState.getChannel()); channelStatus.setCustomerId(customerId);
} channelStatus.setEquipmentId(equipmentId);
channelStatus.setStatusDataType(StatusDataType.RADIO_CHANNEL);
EquipmentChannelStatusData channelStatusData = new EquipmentChannelStatusData();
channelStatus.setDetails(channelStatusData);
}
((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put(
radioState.getFreqBand(), radioState.getChannel());
return channelStatus;
} }
private boolean updateChannelPowerLevels(String apId, ApElementConfiguration apElementConfiguration, private boolean updateChannelPowerLevels(String apId, ApElementConfiguration apElementConfiguration,