From 2df5674cb403f5dbda5c7fcb30e263b5d0d9947e Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Tue, 4 Sep 2018 02:20:41 +0000 Subject: [PATCH] Refactor cloud region registration logic Invoke the upgraded MultiCloud API for registration Change-Id: I1ec415b496bb6d5798db1388e4074b4bae76e278 Issue-ID: AAI-1560 Signed-off-by: Bin Yang --- docs/platform/consumedapis.rst | 4 ++-- docs/platform/installation.rst | 13 ++++++++++++- .../src/main/java/org/onap/aai/esr/common/MsbConfig.java | 2 +- .../org/onap/aai/esr/externalservice/cloud/IVimManage.java | 2 +- .../test/java/org/onap/aai/esr/common/MsbConfigTest.java | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/platform/consumedapis.rst b/docs/platform/consumedapis.rst index 9d64a9b..24dce36 100644 --- a/docs/platform/consumedapis.rst +++ b/docs/platform/consumedapis.rst @@ -60,7 +60,7 @@ ESR will call the API from Multi-Cloud to update the cloud-region information af #. Update VIM Info: - ``POST /api/multicloud /v0/{cloud-owner}_{cloud-region}/registry`` + ``POST /api/multicloud /v1/{cloud-owner}/{cloud-region}/registry`` More details could be found at `Multi-Cloud APIs `_. @@ -71,4 +71,4 @@ Both esr-server and esr-gui need to registered to MSB. Service Registration: ``/api/microservices/v1/services`` -More details could be found at `MSB APIs `_. \ No newline at end of file +More details could be found at `MSB APIs `_. diff --git a/docs/platform/installation.rst b/docs/platform/installation.rst index e9a1245..6282830 100644 --- a/docs/platform/installation.rst +++ b/docs/platform/installation.rst @@ -68,12 +68,23 @@ MultiCloud register to MSB curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9001"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v1", "url": "/api/multicloud/v1","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9001"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" + curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9004"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v1", "url": "/api/multicloud-vio/v1","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9004"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" + curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9006"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v1", "url": "/api/multicloud-ocata/v1","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9006"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" + +[Note: serviceName "multicloud-titanium_cloud" is depreciated from ONAP Casablanca Release] curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9005"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v0", "url": "/api/multicloud-titaniumcloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9005"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" + +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v1", "url": "/api/multicloud-titaniumcloud/v1","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9005"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services" + ESR register to MSB ^^^^^^^^^^^^^^^^^^^^^^^ @@ -92,4 +103,4 @@ http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/sdncontroller/sdncView.html http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/vim/vimView.html -http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/ems/emsView.html \ No newline at end of file +http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/ems/emsView.html 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"); -- 2.16.6