From 1fbc4e1dffbd6920e7dad03120607cd55901708c Mon Sep 17 00:00:00 2001 From: Lynn Shi Date: Fri, 30 Apr 2021 14:00:32 -0400 Subject: [PATCH] WIFI-2080 update based on review comments --- .../controller/OpensyncCloudGatewayController.java | 12 ++++++------ .../wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java index 841fa54..783852d 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/controller/OpensyncCloudGatewayController.java @@ -43,7 +43,7 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWConfigChangeNoti import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareDownloadRequest; import com.telecominfraproject.wlan.equipmentgateway.models.CEGWFirmwareFlashRequest; import com.telecominfraproject.wlan.equipmentgateway.models.CEGWNewChannelRequest; -import com.telecominfraproject.wlan.equipmentgateway.models.CEGWCellSizeRequest; +import com.telecominfraproject.wlan.equipmentgateway.models.CEGWCellSizeAttributesRequest; import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRadioResetRequest; import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRebootRequest; import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRouteCheck; @@ -207,8 +207,8 @@ public class OpensyncCloudGatewayController { case NewChannelRequest: ret.add(sendNewChannelRequest(session, (CEGWNewChannelRequest) command)); break; - case CellSizeRequest: - ret.add(sendCellSizeRequest(session, (CEGWCellSizeRequest) command)); + case CellSizeAttributesRequest: + ret.add(sendCellSizeRequest(session, (CEGWCellSizeAttributesRequest) command)); break; default: LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command); @@ -302,7 +302,7 @@ public class OpensyncCloudGatewayController { return sendMessage(session, command.getInventoryId(), command); } - private EquipmentCommandResponse sendCellSizeRequest(OvsdbSession session, CEGWCellSizeRequest command) { + private EquipmentCommandResponse sendCellSizeRequest(OvsdbSession session, CEGWCellSizeAttributesRequest command) { return sendMessage(session, command.getInventoryId(), command); } @@ -342,8 +342,8 @@ public class OpensyncCloudGatewayController { String resultDetails = tipwlanOvsdbClient.processNewChannelsRequest(inventoryId, newBackupChannels,newPrimaryChannels); response.setResultDetail(resultDetails); - } else if (command instanceof CEGWCellSizeRequest) { - CEGWCellSizeRequest request = (CEGWCellSizeRequest) command; + } else if (command instanceof CEGWCellSizeAttributesRequest) { + CEGWCellSizeAttributesRequest request = (CEGWCellSizeAttributesRequest) command; Map cellSizeAttributeMap = request.getCellSizeAttributesMap(); String resultDetails = tipwlanOvsdbClient.processCellSizeAttributesRequest(inventoryId, cellSizeAttributeMap); diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java index c9c03bb..047a677 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRrmConfig.java @@ -327,8 +327,9 @@ public class OvsdbRrmConfig extends OvsdbDaoBase { // for insert, make sure it is actually in the table confirmRowExistsInTable(ovsdbClient, ((InsertResult) res).getUuid(), wifiRrmConfigDbTable); } else if (res instanceof ErrorResult) { - LOG.error("configureWifiRrm error {}", (res)); - throw new RuntimeException("configureWifiRrm " + ((ErrorResult) res).getError() + " " + ((ErrorResult) res).getDetails()); + LOG.error("processCellSizeAttributesRequest error {}", (res)); + throw new RuntimeException("processCellSizeAttributesRequest " + ((ErrorResult) res).getError() + + " " + ((ErrorResult) res).getDetails()); } }