From 661a24fd57de02869a9771761e0fcba7eb77d121 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Wed, 8 Aug 2018 15:54:51 +0300
Subject: Update URI used to contact SO

Change-Id: I9b2e259b29e838cd027e7f9907704443293bef85
Issue-ID: VID-282
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 .../src/main/webapp/WEB-INF/conf/system.properties     |  2 +-
 .../webapp/WEB-INF/conf/system_template.properties     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

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 035d3d8f1..087a5d54c 100755
--- 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
 #dev2dev
 #good
-mso.server.url=https://mso.api.simpledemo.openecomp.org:8443/ecomp/mso/infra
+mso.server.url=https://mso.api.simpledemo.onap.org:8443/onap/so/infra
 mso.polling.interval.msecs=2000
 mso.max.polls=3
 mso.user.name=infraportal
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 2ca038a5e..5596de03a 100755
--- 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}
 mso.password.x=${VID_MSO_PASS}
 #E2E is v3
-mso.restapi.svc.e2einstance=/ecomp/mso/infra/e2eServiceInstances/v3
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v6
+mso.restapi.svc.e2einstance=/onap/so/infra/e2eServiceInstances/v3
+mso.restapi.svc.instance=/onap/so/infra/serviceInstances/v6
 mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs
-mso.restapi.vnf.changemanagement.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v6
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v6?
+mso.restapi.vnf.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs
+mso.restapi.vnf.changemanagement.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
+mso.restapi.network.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/networks
+mso.restapi.vf.module.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/onap/so/infra/serviceInstances/v6/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/onap/so/infra/orchestrationRequests/v6
+mso.restapi.get.orc.reqs=/onap/so/infra/orchestrationRequests/v6?
 mso.restapi.get.man.tasks=/tasks/v1
 mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
 mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
-- 
cgit 1.2.3-korg