diff options
Diffstat (limited to 'vid-automation/src')
18 files changed, 33 insertions, 33 deletions
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/<ACTIVE_ACTION>", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", "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/<ACTIVE_ACTION>", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", "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 +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json index 773bfd0dd..366de41b1 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" }, "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json index 73ff898a7..57c132fbf 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json index ce27b5920..eaba1da0f 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json index 7e808b812..919f02289 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json b/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json index fd8171760..70ab0fd1c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json +++ b/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "DELETE", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1" }, "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json index ef551184d..ea1dfd252 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 202, "body": "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json index 073fd359f..5c4c9ad7c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 404, "body": "" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json index c85b3cb63..ad2bebe2c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json index f8f6fbbbd..8875503b6 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} |