X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docs%2Fplatform%2Finstallation.rst;h=6282830a0ea4795c593a77919a357e1aa9eee253;hb=53506cec0c9e2366e1a7bc81a554eac278b0b254;hp=687f19c2e8972faf12113d031db90f2a59a3b6c8;hpb=197df4efbcc198da9c5cea60a7a65fd83b9b6570;p=aai%2Fesr-server.git

diff --git a/docs/platform/installation.rst b/docs/platform/installation.rst
index 687f19c..6282830 100644
--- a/docs/platform/installation.rst
+++ b/docs/platform/installation.rst
@@ -19,25 +19,29 @@ sudo apt-get install -y docker-engine
 
 docker ps
 
-Run esr-server docker
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Login the ONAP docker registry first: sudo docker login -u docker -p docker nexus3.onap.org:10001
-
-sudo docker run -p  9518:9518 -d --net=host --name esr-server -e MSB_ADDR=${MSB_SERVER_IP}:80 nexus3.onap.org:10001/onap/aai/esr-server
-
-Run esr-gui docker
-^^^^^^^^^^^^^^^^^^^^^^^
-
-sudo docker run -p  9519:8080 -d --net=host --name esr-gui nexus3.onap.org:10001/onap/aai/esr-gui
-
-Check status of ESR
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Test whether esr-server is runing:
-
-GET  http://ESR_SERVICE_IP:9518/api/aai-esr-server/v1/test 
-
+Run esr-server docker
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Login the ONAP docker registry first: sudo docker login -u docker -p docker nexus3.onap.org:10001
+
+sudo docker pull nexus3.onap.org:10001/onap/aai/esr-server:latest
+
+sudo docker run -i -t -d -p 9518:9518 -e MSB_ADDR=${MSB_SERVER_IP}:80 --name esr_server nexus3.onap.org:10001/onap/aai/esr-server:latest
+
+Run esr-gui docker
+^^^^^^^^^^^^^^^^^^^^^^^
+
+sudo docker pull nexus3.onap.org:10001/onap/aai/esr-gui:latest
+
+docker run -i -t -d -p 9519:8080 -e MSB_ADDR=${MSB_SERVER_IP}:80 --name esr_gui nexus3.onap.org:10001/onap/aai/esr-gui:latest
+
+Check status of ESR
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Test whether esr-server is running:
+
+GET  https://ESR_SERVICE_IP:9518/api/aai-esr-server/v1/test 
+
 The returned status should be 200.
 
 Visit ESR portal:
@@ -64,18 +68,29 @@ 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"
 
-ESR register to MSB
-^^^^^^^^^^^^^^^^^^^^^^^
+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": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "ESR_SERVER_IP","port": "9518"}]}' "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"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "url": "/esr-gui","protocol": "UI", "visualRange":"1", "path":"/iui/aai-esr-gui", "nodes": [ {"ip": "ESR_SERVER_IP","port": "9519"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+ESR register to MSB
+^^^^^^^^^^^^^^^^^^^^^^^
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "ESR_SERVER_IP","port": "9518"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI",  "nodes": [ {"ip": "ESR_SERVER_IP","port": "9519"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
 
 ESR usage
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -88,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