diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-09-04 02:20:41 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2018-09-04 02:20:41 +0000 |
| commit | 2df5674cb403f5dbda5c7fcb30e263b5d0d9947e (patch) | |
| tree | dfb822ac14b4b825c3b8bea572996d8f00a2faba /esr-mgr | |
| parent | 0836ecdc1d78e7fb3c5c8c9be5bd48c4d70e234f (diff) | |
Refactor cloud region registration logic
Invoke the upgraded MultiCloud API for registration
Change-Id: I1ec415b496bb6d5798db1388e4074b4bae76e278
Issue-ID: AAI-1560
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'esr-mgr')
3 files changed, 3 insertions, 3 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbConfig.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbConfig.java index 3d827a8..a9858e3 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbConfig.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbConfig.java @@ -64,7 +64,7 @@ public class MsbConfig { } public static String getMultiCloudAddr() { - return msbServerAddr + "/api/multicloud/v0"; + return msbServerAddr + "/api/multicloud/v1"; } public static String getMsbDiscoveryIp() { diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/IVimManage.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/IVimManage.java index 8d5ead6..b4a51e3 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/IVimManage.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/IVimManage.java @@ -26,7 +26,7 @@ import org.onap.aai.esr.exception.ExtsysException; @Path("/") public interface IVimManage { @POST - @Path("/{cloud_owner}_{cloud_region_id}/registry") + @Path("/{cloud_owner}/{cloud_region_id}/registry") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public void updateVIM(@PathParam("cloud_owner") String cloud_owner, diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/common/MsbConfigTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/common/MsbConfigTest.java index b1b7b33..feb14d7 100644 --- a/esr-mgr/src/test/java/org/onap/aai/esr/common/MsbConfigTest.java +++ b/esr-mgr/src/test/java/org/onap/aai/esr/common/MsbConfigTest.java @@ -36,7 +36,7 @@ public class MsbConfigTest { MsbConfig.setMultiCloudAddr("multicloud-address");
Assert.assertEquals(MsbConfig.multiCloudAddr, "multicloud-address");
- Assert.assertEquals(MsbConfig.getMultiCloudAddr(), "msb-server/api/multicloud/v0");
+ Assert.assertEquals(MsbConfig.getMultiCloudAddr(), "msb-server/api/multicloud/v1");
MsbConfig.setMsbDiscoveryIp("discovery://1111");
Assert.assertEquals(MsbConfig.getMsbDiscoveryIp(), "discovery://1111");
|