Update URI used to contact SO

Change-Id: I9b2e259b29e838cd027e7f9907704443293bef85
Issue-ID: VID-282
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 035d3d8..087a5d5 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -154,7 +154,7 @@ authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-conn
 #mso.server.url=http://localhost:8089\r
 #dev2dev\r
 #good\r
-mso.server.url=https://mso.api.simpledemo.openecomp.org:8443/ecomp/mso/infra\r
+mso.server.url=https://mso.api.simpledemo.onap.org:8443/onap/so/infra\r
 mso.polling.interval.msecs=2000\r
 mso.max.polls=3\r
 mso.user.name=infraportal\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 2ca038a..5596de0 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,16 +103,16 @@ 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=/ecomp/mso/infra/e2eServiceInstances/v3\r
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v6\r
+mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3\r
+mso.restapi.svc.instance=/onap/so/infra/serviceInstances/v6\r
 mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances\r
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs\r
-mso.restapi.vnf.changemanagement.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>\r
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/networks\r
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v6\r
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v6?\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.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.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