Merge "Correct flow for ScaleOut"

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index ddaa861..f37f81d 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -29,7 +29,7 @@ ENV VID_AAI_HOST aai.api.simpledemo.onap.org
 ENV VID_AAI_PORT 8443\r
 ENV VID_APP_DISPLAY_NAME VID\r
 ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context\r
-ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080\r
+ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra\r
 ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins\r
 ENV VID_MSO_USER InfraPortalClient\r
 ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz\r

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index f41c4cf..06a2e6b 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -103,17 +103,17 @@ mso.max.polls=10
 mso.user.name=${VID_MSO_USER}\r
 mso.password.x=${VID_MSO_PASS}\r
 #E2E is v3\r
-mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3\r
+mso.restapi.svc.e2einstance=/e2eServiceInstances/v3\r
 mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances\r
 mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances\r
-mso.restapi.vnf.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs\r
-mso.restapi.vnf.changemanagement.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>\r
-mso.restapi.network.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/networks\r
-mso.restapi.vf.module.scaleout=/onap/so/infra/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
-mso.restapi.vf.module.instance=/onap/so/infra//serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
-mso.restapi.volume.group.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
-mso.restapi.get.orc.req=/onap/so/infra/orchestrationRequests/v6\r
-mso.restapi.get.orc.reqs=/onap/so/infra/orchestrationRequests/v6?\r
+mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs\r
+mso.restapi.vnf.changemanagement.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>\r
+mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks\r
+mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut\r
+mso.restapi.vf.module.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
+mso.restapi.volume.group.instance=/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
+mso.restapi.get.orc.req=/orchestrationRequests/v6\r
+mso.restapi.get.orc.reqs=/orchestrationRequests/v6?\r
 mso.restapi.get.man.tasks=/tasks/v1\r
 mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations\r
 mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>\r