Update MSO change-management URL

Issue-ID: VID-622
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Change-Id: Ibe7b07ecc858895de579d3dacf1a3312c6793fad

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 0e96997..5454724 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
@@ -106,7 +106,7 @@ mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
 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.vnf.changemanagement.instance=${mso.restapi.service.instance}/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules

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 272f4d0..0987199 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
@@ -106,7 +106,7 @@ mso.password.x=${VID_MSO_PASS}
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
 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.vnf.changemanagement.instance=${mso.restapi.service.instance}/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules

diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
index ecbc237..0fb8b1c 100644 (file)
--- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
@@ -157,7 +157,7 @@ mso.user.name=infraportal
 mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
 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.vnf.changemanagement.instance=${mso.restapi.service.instance}/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
@@ -169,7 +169,7 @@ mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
 mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
 mso.restapi.get.man.tasks=/tasks/v1
 mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
-mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id>
+mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7

diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java
index 758e15e..aa93bc4 100644 (file)
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java
@@ -18,7 +18,7 @@ public abstract  class PresetMsoChangeManagementBase extends PresetMSOBaseCreate
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+ getReqPathTrailer();
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+ getReqPathTrailer();
     }
 
     protected String getReqPathTrailer() {

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
index c3fb0b0..6d08d52 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
   } ,
   "simulatorResponse": {
     "responseCode": 404,

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
index 27eb0dc..5cbf1ee 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
   } ,
   "simulatorResponse": {
     "responseCode": 409,

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
index 021d012..7324da3 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
   } ,
   "simulatorResponse": {
     "responseCode": 202,

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
index d48d2ae..c436b23 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
   } ,
   "simulatorResponse": {
     "responseCode": 404,

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
index fa429c9..67ed473 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
   } ,
   "simulatorResponse": {
     "responseCode": 409,

diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
index 4ce1936..efd3b8d 100644 (file)
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+    "path": ".*/serviceInstantiation/v./serviceInstances/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
   } ,
   "simulatorResponse": {
     "responseCode": 202,