Merge "Fix service instantiation error"

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 266ca96..049ebf0 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
@@ -161,7 +161,7 @@ mso.user.name=infraportal
 mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz\r
 #E2E is v3\r
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3\r
-mso.restapi.svc.instance=/serviceInstances/v6\r
+mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances\r
 mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances\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

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 29d2f0b..60ef9a7 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
@@ -104,7 +104,7 @@ mso.user.name=${VID_MSO_USER}
 mso.password.x=${VID_MSO_PASS}\r
 #E2E is v3\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=/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