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 --- .../aLacarteFlow/get_aai_search_named_query.json | 2 +- .../get_sdc_catalog_services_ggghhh.json | 4 +- .../aLacarteFlow/mso_create_vf_module.json | 25 --------- .../aLacarteFlow/mso_create_vnf.json | 63 ---------------------- .../aLacarteFlow/mso_create_volume_group.json | 25 --------- 5 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json delete mode 100644 vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json delete mode 100644 vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json (limited to 'vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow') diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json index ac6fed851..4167b68cd 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json +++ b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json @@ -6,7 +6,7 @@ "simulatorResponse": { "responseCode": 200, "body": { - "inventory-response-item":[{"model-name":"ServicevMMSCPID298109","service-instance":{"service-instance-id":"537d3eb0-b7ab-4fe8-a438-6166ab6af49b","service-instance-name":"ggghhh"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"VSP1710PID298109_vMMSC","generic-vnf":{"vnf-id":"0eb38f69-d96b-4d5e-b8c9-3736c292f0f7","vnf-name":"ssgsg","vnf-type":"ServicevMMSCPID298109/VSP1710PID298109_vMMSC 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1506517656216","model-invariant-id":"e7961100-cde6-4b5a-bcda-b8945086950a","model-version-id":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e","model-customization-id":"6b8fc7dc-2db1-4283-a222-b07d10595495","nf-type":"MOBILITY MESSAGING ","nf-function":"Multimedia Message Service Center ","nf-role":"VMMSC","nf-naming-code":"null"},"extra-properties":{}}]}}] + "inventory-response-item":[{"model-name":"ServicevWINIFREDPID298109","service-instance":{"service-instance-id":"537d3eb0-b7ab-4fe8-a438-6166ab6af49b","service-instance-name":"ggghhh"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"VSP1710PID298109_vWINIFRED","generic-vnf":{"vnf-id":"0eb38f69-d96b-4d5e-b8c9-3736c292f0f7","vnf-name":"ssgsg","vnf-type":"ServicevWINIFREDPID298109/VSP1710PID298109_vWINIFRED 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1506517656216","model-invariant-id":"e7961100-cde6-4b5a-bcda-b8945086950a","model-version-id":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e","model-customization-id":"6b8fc7dc-2db1-4283-a222-b07d10595495","nf-type":"EMANUEL MESSAGING ","nf-function":"Multimedia Message Service Center ","nf-role":"vWINIFRED","nf-naming-code":"null"},"extra-properties":{}}]}}] } } } \ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json index 4520b0d3a..5641b9550 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json +++ b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json @@ -22,10 +22,10 @@ "body": { "uuid": "aa2f8e9c-9e47-4b15-a95c-4a93855ac61b", "invariantUUID": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", - "name": "ServicevMMSCPID298109", + "name": "ServicevWINIFREDPID298109", "version": "1.0", "toscaModelURL": "./ggghhh.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json deleted file mode 100644 index afba0683e..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/vfModules", - "body": { - "requestDetails": { - "requestParameters": { - "testApi": "GR_API" - } - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "REQUEST_ID" - } - } - } -} \ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json deleted file mode 100644 index 71677143c..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs", - "body": { - "requestDetails": { - "requestInfo": { - "instanceName": "INSTANCE_NAME", - "source": "VID", - "suppressRollback": false, - "requestorId": "mo37915000", - "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034" - }, - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName": "VSP1710PID298109_vMMSC", - "modelVersion": "1.0", - "modelCustomizationId": "6b8fc7dc-2db1-4283-a222-b07d10595495", - "modelCustomizationName": "VSP1710PID298109_vMMSC 0" - }, - "requestParameters": { - "userParams": [], - "testApi": "GR_API" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "some legacy region", - "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" - }, - "lineOfBusiness": {"lineOfBusinessName": "ECOMP"}, - "platform": { - "platformName": "platform" - }, - "relatedInstanceList": [{ - "relatedInstance": { - "instanceId": "SERVICE_INSTANCE_ID", - "modelInfo": { - "modelType": "service", - "modelName": "ServicevMMSCPID298109", - "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", - "modelVersion": "1.0", - "modelVersionId": "aa2f8e9c-9e47-4b15-a95c-4a93855ac61b" - } - } - } - ] - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "dbe54591-c8ed-46d3-abc7-d3a24873dfbd" - } - } - } -} \ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json deleted file mode 100644 index c9d06e9e2..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/volumeGroups", - "body": { - "requestDetails": { - "requestParameters": { - "testApi": "GR_API" - } - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "REQUEST_ID" - } - } - } -} \ No newline at end of file -- cgit 1.2.3-korg