From 66af8b9b391879be78660d6ccb0a1f1f9340b423 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 11 Mar 2019 09:34:34 +0200 Subject: Merge automation from ECOMP's repository Reference commit in ECOMP: 8e92a8c6 Issue-ID: VID-378 Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48 Signed-off-by: Ittay Stern --- .../mso_request_activate_configuration.json | 34 +++++++++++ .../mso_request_activate_fabric_configuration.json | 22 +++++++ .../mso_request_create_configuration.json | 68 ++++++++++------------ .../mso_request_deactivate_and_cloud_delete.json | 5 ++ ...equest_delete_or_unassign_service_instance.json | 2 +- 5 files changed, 94 insertions(+), 37 deletions(-) create mode 100644 vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json create mode 100644 vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json create mode 100644 vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json (limited to 'vid-automation/src/test/resources/registration_to_simulator/body_jsons') diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json new file mode 100644 index 000000000..b0bf14b55 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json @@ -0,0 +1,34 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "model-invariant-id-9533", + "modelVersionId": "model-version-id-9533", + "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "us16807000" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", + "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "modelName": "ServiceContainerMultiplepProbes", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json new file mode 100644 index 000000000..97bc6e46d --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json @@ -0,0 +1,22 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + }, + "requestParameters": { + "aLaCarte": false + } + } +} \ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json index e0942bae2..c726590eb 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json @@ -1,4 +1,3 @@ - { "requestDetails": { "modelInfo": { @@ -11,49 +10,46 @@ "modelCustomizationName": "Port Mirroring Configuration By Policy 1" }, "cloudConfiguration": { - "lcpCloudRegionId": "AAIAIC25" + "lcpCloudRegionId": "JANET25" }, "requestInfo": { - "instanceName":"test_sssdad", + "instanceName": "dummy_instance", "source": "VID", - "requestorId": "1" + "requestorId": "us16807000" }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6 ", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersion": "1.0" - } + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", + "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "modelName": "ServiceContainerMultiplepProbes", + "modelVersion": "1.0" } - }, - { - "relatedInstance": { - "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", - "instanceDirection": "source", - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", - "modelName": "vmmeService2", - "modelVersion": "1.0", - "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17" - } + } + }, { + "relatedInstance": { + "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a", + "modelVersionId": "cb05b259-9f26-4b33-b96c-13c2c202c091", + "modelName": "vf_vEPDG", + "modelVersion": "2.0", + "modelCustomizationId": "35aeaae9-74f7-4b6a-adda-65edb0110361" } - }, - { - "relatedInstance": { - "instanceId": "AS-pnf2-10219--as988q", - "instanceDirection": "destination", - "modelInfo": { - "modelType": "pnf" - } + } + }, { + "relatedInstance": { + "instanceName": "AS-pnf2-10219--as988q", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "pnf" } } + } ], "requestParameters": { "userParams": [] diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json new file mode 100644 index 000000000..ad588b68b --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json @@ -0,0 +1,5 @@ +{ + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "userId": "us16807000" +} \ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json index 951eac1fb..3b0204aa7 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json @@ -12,7 +12,7 @@ "requestorId": "16807000" }, "requestParameters": { - "testApi": "GR_API", + "testApi": "VNF_API", "aLaCarte": false } } -- cgit 1.2.3-korg