Point to SO v6

Change-Id: I79d480f40ba974de4164e62c6189278930fd7cde
Issue-ID: VID-215
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 752688d..2478804 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
@@ -159,13 +159,13 @@ mso.polling.interval.msecs=2000
 mso.max.polls=3\r
 mso.user.name=infraportal\r
 mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz\r
-mso.restapi.svc.instance=/serviceInstances/v4\r
-mso.restapi.vnf.instance=/serviceInstances/v4/<service_instance_id>/vnfs\r
-mso.restapi.network.instance=/serviceInstances/v4/<service_instance_id>/networks\r
-mso.restapi.vf.module.instance=/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
-mso.restapi.volume.group.instance=/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
-mso.restapi.get.orc.req=/orchestrationRequests/v4\r
-mso.restapi.get.orc.reqs=/orchestrationRequests/v4?\r
+mso.restapi.svc.instance=/serviceInstances/v6\r
+mso.restapi.vnf.instance=/serviceInstances/v6/<service_instance_id>/vnfs\r
+mso.restapi.network.instance=/serviceInstances/v6/<service_instance_id>/networks\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
 vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks\r
 mso.dme2.client.timeout=30000\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 462ebb4..06b2514 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
@@ -102,13 +102,13 @@ mso.polling.interval.msecs=${MSO_POLLING_INTERVAL_MSECS}
 mso.max.polls=10\r
 mso.user.name=${VID_MSO_USER}\r
 mso.password.x=${VID_MSO_PASS}\r
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v4\r
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs\r
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/networks\r
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules\r
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups\r
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v4\r
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v4?\r
+mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v6\r
+mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v6/<service_instance_id>/vnfs\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
 vid.truststore.filename=${VID_TRUSTSTORE_FILE}\r
 vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS}\r
 mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT}\r