Invoke the upgraded MultiCloud API for registration
Change-Id: I1ec415b496bb6d5798db1388e4074b4bae76e278
Issue-ID: AAI-1560
Signed-off-by: Bin Yang <bin.yang@windriver.com>
- ``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 <https://wiki.onap.org/download/attachments/13599038/MultiVIM-onap-draft-r1-0822.doc?version=1&modificationDate=1503406573000&api=v2>`_.
More details could be found at `Multi-Cloud APIs <https://wiki.onap.org/download/attachments/13599038/MultiVIM-onap-draft-r1-0822.doc?version=1&modificationDate=1503406573000&api=v2>`_.
Service Registration: ``/api/microservices/v1/services``
Service Registration: ``/api/microservices/v1/services``
-More details could be found at `MSB APIs <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation>`_.
\ No newline at end of file
+More details could be found at `MSB APIs <https://wiki.onap.org/display/DW/Microservice+Bus+API+Documentation>`_.
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": "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": "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": "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-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\r
^^^^^^^^^^^^^^^^^^^^^^^\r
\r
ESR register to MSB\r
^^^^^^^^^^^^^^^^^^^^^^^\r
\r
http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/vim/vimView.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
}
public static String getMultiCloudAddr() {
}
public static String getMultiCloudAddr() {
- return msbServerAddr + "/api/multicloud/v0";
+ return msbServerAddr + "/api/multicloud/v1";
}
public static String getMsbDiscoveryIp() {
}
public static String getMsbDiscoveryIp() {
@Path("/")
public interface IVimManage {
@POST
@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,
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public void updateVIM(@PathParam("cloud_owner") String cloud_owner,
\r
MsbConfig.setMultiCloudAddr("multicloud-address");\r
Assert.assertEquals(MsbConfig.multiCloudAddr, "multicloud-address");\r
\r
MsbConfig.setMultiCloudAddr("multicloud-address");\r
Assert.assertEquals(MsbConfig.multiCloudAddr, "multicloud-address");\r
- Assert.assertEquals(MsbConfig.getMultiCloudAddr(), "msb-server/api/multicloud/v0");\r
+ Assert.assertEquals(MsbConfig.getMultiCloudAddr(), "msb-server/api/multicloud/v1");\r
\r
MsbConfig.setMsbDiscoveryIp("discovery://1111");\r
Assert.assertEquals(MsbConfig.getMsbDiscoveryIp(), "discovery://1111");\r
\r
MsbConfig.setMsbDiscoveryIp("discovery://1111");\r
Assert.assertEquals(MsbConfig.getMsbDiscoveryIp(), "discovery://1111");\r