From d01c185ffbb1a41a4c9773ab416b04a0a770c2a2 Mon Sep 17 00:00:00 2001 From: Eylon Malin 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 Change-Id: I7a0744f5d6cfe776ce2f17b11aa5ebba4c8e65fb Signed-off-by: Eylon Malin --- .../presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java | 2 +- .../presets/mso/PresetMSOCreateServiceInstancePost.java | 2 +- .../activateDeactivate/mso_activate_service_instance.json | 2 +- .../activateDeactivate/mso_activate_service_instance_error.json | 4 ++-- .../create_new_instance/deploy/mso_create_svc_instance.json | 4 ++-- .../registration_to_simulator/pProbe/mso_add_pnf_relationship.json | 4 ++-- .../pProbe/mso_add_pnf_relationship_error.json | 4 ++-- .../registration_to_simulator/pProbe/mso_remove_pnf_relationship.json | 4 ++-- .../pProbe/mso_remove_pnf_relationship_error.json | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'vid-automation/src/main') diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java index ce0f8fd71..29e1365af 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java @@ -8,7 +8,7 @@ public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstance @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v."; + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java index 39b415fa2..9a41e5bea 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java @@ -6,7 +6,7 @@ package org.onap.simulator.presetGenerator.presets.mso; public class PresetMSOCreateServiceInstancePost extends PresetMSOBaseCreateInstancePost { public String getReqPath() { - return getRootPath() + "/serviceInstances/v."; + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } } diff --git a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json index 3cfcd7af5..bbd8ab217 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/", "body": { "requestDetails": { "modelInfo": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json index 85855ad52..eea3caad9 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/", "body": { "requestDetails": { "modelInfo": { @@ -24,4 +24,4 @@ "simulatorResponse": { "responseCode": 500 } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json index d4d253eb4..5cf1c341f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v.", + "path": "/mso/serviceInstantiation/v./serviceInstances", "body": { "requestDetails": { "requestInfo": { @@ -46,4 +46,4 @@ } } } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json index b794f476c..181e50f72 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", "body": "{\"requestDetails\":{\"modelInfo\":{\"modelType\":\"service\",\"modelInvariantId\":\"709d1be4-9a3f-4a29-8c4d-a20465e808a3\",\"modelVersionId\":\"240376de-870e-48df-915a-31f140eedd2c\",\"modelName\":\"Demo Service 1\",\"modelVersion\":\"1.0\"},\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"us16807000\"},\"relatedInstanceList\":[{\"relatedInstance\":{\"instanceName\":\"MX_960-F722\",\"modelInfo\":{\"modelType\":\"pnf\"}}}],\"requestParameters\":{\"aLaCarte\":true}}}" }, "simulatorResponse": { @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json index d1fefe20f..ff2f434c1 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", "body": { "requestDetails": { "modelInfo": { @@ -35,4 +35,4 @@ "responseCode": 500 } } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json index 72245ce66..514298ce5 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", "body": { "requestDetails": { "modelInfo": { @@ -40,4 +40,4 @@ } } } -} \ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json index 2744cae54..065d027cc 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", "body": { "requestDetails": { "modelInfo": { @@ -34,4 +34,4 @@ "simulatorResponse": { "responseCode": 500 } -} \ No newline at end of file +} -- cgit 1.2.3-korg