diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index bb87bf2..3f9bb39 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -813,8 +813,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra } CEGWFirmwareDownloadRequest fwDownloadRequest = new CEGWFirmwareDownloadRequest(ce.getInventoryId(), - ce.getId(), fwVersion.getVersionName(), fwVersion.getFilename(), - fwVersion.getValidationMethod(), fwVersion.getValidationCode()); + ce.getId(), fwVersion.getVersionName(), fwVersion.getFilename()); List commands = new ArrayList<>(); commands.add(fwDownloadRequest); 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 5e1a94d..c2aa0ba 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 @@ -341,10 +341,9 @@ public class OpensyncCloudGatewayController { String filepath = dlRequest.getFilePath(); String firmwareVersion = dlRequest.getFirmwareVersion(); String username = dlRequest.getUsername(); - String validationCode = dlRequest.getValidationCode(); String resultDetails = tipwlanOvsdbClient.processFirmwareDownload(inventoryId, filepath, firmwareVersion, - username, validationCode); + username); response.setResultDetail(resultDetails); diff --git a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java index 4646dbc..a4bb897 100644 --- a/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbClientInterface.java @@ -21,8 +21,7 @@ public interface OvsdbClientInterface { void processClientBlocklistChange(String apId, List blockList); - String processFirmwareDownload(String apId, String firmwareUrl, String firmwareVersion, String username, - String validationCode); + String processFirmwareDownload(String apId, String firmwareUrl, String firmwareVersion, String username); String closeSession(String apId); diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java index a371f77..92fa495 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java @@ -815,13 +815,11 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface { } @Override - public String processFirmwareDownload(String apId, String firmwareUrl, String firmwareVersion, String username, - String validationCode) { + public String processFirmwareDownload(String apId, String firmwareUrl, String firmwareVersion, String username) { try { OvsdbSession session = ovsdbSessionMapInterface.getSession(apId); - ovsdbDao.configureFirmwareDownload(session.getOvsdbClient(), apId, firmwareUrl, firmwareVersion, username, - validationCode); + ovsdbDao.configureFirmwareDownload(session.getOvsdbClient(), apId, firmwareUrl, firmwareVersion, username); } catch (Exception e) { LOG.error("Failed to initialize firmware download to " + apId + " " + e.getLocalizedMessage()); return "Failed to initialize firmware download to " + apId + " " + e.getLocalizedMessage(); diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 671f4f1..defe501 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -62,9 +62,8 @@ public class OvsdbDao extends OvsdbDaoBase { } public void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl, - String firmwareVersion, String username, String validationCode) throws Exception { - ovsdbFirmware.configureFirmwareDownload(ovsdbClient, apId, firmwareUrl, firmwareVersion, username, - validationCode); + String firmwareVersion, String username) throws Exception { + ovsdbFirmware.configureFirmwareDownload(ovsdbClient, apId, firmwareUrl, firmwareVersion, username); } public void configureFirmwareFlash(OvsdbClient ovsdbClient, String apId, String firmwareVersion, String username) { diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbFirmwareConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbFirmwareConfig.java index 9485d16..8c2d8c0 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbFirmwareConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbFirmwareConfig.java @@ -21,14 +21,13 @@ import com.vmware.ovsdb.service.OvsdbClient; public class OvsdbFirmwareConfig extends OvsdbDaoBase { void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl, String firmwareVersion, - String username, String validationCode) throws Exception { + String username) throws Exception { try { - LOG.debug("configureFirmwareDownload for {} to version {} url {} validationCode {} username {}", apId, - firmwareVersion, firmwareUrl, validationCode, username); + LOG.debug("configureFirmwareDownload for {} to version {} url {} username {}", apId, + firmwareVersion, firmwareUrl, username); List operations = new ArrayList<>(); Map updateColumns = new HashMap<>(); updateColumns.put("upgrade_dl_timer", new Atom<>(upgradeDlTimerSeconds)); - updateColumns.put("firmware_pass", new Atom<>(validationCode)); updateColumns.put("firmware_url", new Atom<>(firmwareUrl)); updateColumns.put("upgrade_timer", new Atom<>(upgradeTimerSeconds)); Row row = new Row(updateColumns); diff --git a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java index 5116e6d..ffc4212 100644 --- a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java +++ b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java @@ -152,13 +152,11 @@ public class OpensyncGatewayTipWlanOvsdbClientTest { assert (tipwlanOvsdbClient.processFirmwareDownload("Test_Client_21P10C68818122", "http://127.0.0.1/~username/ea8300-2020-07-08-6632239/openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin", - "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username", - "b0d03d8fba6b2261786ac97d49a629f2").equals(expectedResult)); + "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username").equals(expectedResult)); Mockito.verify(ovsdbDao).configureFirmwareDownload(ovsdbClient, "Test_Client_21P10C68818122", "http://127.0.0.1/~username/ea8300-2020-07-08-6632239/openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade.bin", - "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username", - "b0d03d8fba6b2261786ac97d49a629f2"); + "openwrt-ipq40xx-generic-linksys_ea8300-squashfs-sysupgrade", "username"); }