From d01c185ffbb1a41a4c9773ab416b04a0a770c2a2 Mon Sep 17 00:00:00 2001
From: Eylon Malin <eylon.malin@intl.att.com>
Date: Mon, 9 Sep 2019 21:18:19 +0300
Subject: update MSO create service instance URL

align MSO create service instance URL to
/serviceInstantiation/v7/serviceInstances
also unify some system properties variables

Issue-ID: VID-622
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I7a0744f5d6cfe776ce2f17b11aa5ebba4c8e65fb
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
---
 epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties         | 4 +---
 .../src/main/webapp/WEB-INF/conf/system_template.properties           | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'epsdk-app-onap')

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 c229f5873..9f1b541ec 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
@@ -104,8 +104,7 @@ mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
 
 #E2E is v3
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
-mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances
-mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
+mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs
 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
@@ -123,7 +122,6 @@ mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
-mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
 
 mso.restapi.cloudResourcesApiRoot=/cloudResources/v1
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 e3d46aa72..570368f96 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
@@ -104,8 +104,7 @@ mso.password.x=${VID_MSO_PASS}
 
 #E2E is v3
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
-mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances
-mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
+mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs
 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
@@ -123,7 +122,6 @@ mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
-mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
 
 mso.restapi.cloudResourcesApiRoot=/cloudResources/v1
-- 
cgit 1.2.3-korg