diff options
Diffstat (limited to 'vid-automation/src/test/resources/registration_to_simulator')
35 files changed, 169 insertions, 202 deletions
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json deleted file mode 100644 index 23009f8db..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams": { - "subscriber-type": "INFRA", - "depth": 0 - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"MSO_1610_ST", - "subscriber-name":"MSO_1610_ST", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"ICORE CORE", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"PACKET1 CORE", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-102", - "subscriber-name":"DHV1802-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-101", - "subscriber-name":"DHV1802-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"DHV1802-Subscriber-4", - "subscriber-name":"DHV1802-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-103", - "subscriber-name":"DHV1802-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"DHV1802-Subscriber-2", - "subscriber-name":"DHV1802-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"DHV1802-Subscriber-3", - "subscriber-name":"DHV1802-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json index da18285bc..74b8637aa 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json @@ -7,7 +7,7 @@ }, "body": { "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json index 5dc4e77eb..386c982c0 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json @@ -7,7 +7,7 @@ }, "body": { "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json index a0e9e88cc..a4a63574e 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/pnfs/pnf/DEAAI78" + "path": "/aai/v../network/pnfs/pnf/DEAAI78" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json index cc84a7588..ee88d71ea 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/pnfs/pnf/DEAAI78" + "path": "/aai/v../network/pnfs/pnf/DEAAI78" } , "simulatorResponse": { "responseCode": 500, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json index de0c07bc8..d88343ae4 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json @@ -1,8 +1,8 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations" - } , + "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration" + }, "simulatorResponse": { "responseCode": 202, "body": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json new file mode 100644 index 000000000..90f380ea1 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json @@ -0,0 +1,10 @@ +{ + "simulatorRequest": { + "method": "POST", + "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration" + }, + "simulatorResponse": { + "responseCode": 500, + "body": "ERROR_PAYLOAD" + } +}
\ 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 949a86afb..773bfd0dd 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/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" }, "simulatorResponse": { "responseCode": 202, 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 96322b7ae..73ff898a7 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,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" } , "simulatorResponse": { "responseCode": 500, 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 } } 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 d98dbfe64..ce27b5920 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/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 202, 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 1a6aee73a..7e808b812 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,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 500, 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 c5e3c6ee4..ef551184d 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,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 202, 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 d4b5f54fc..073fd359f 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,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json index a43092ef9..a71270e72 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json +++ b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json @@ -2,7 +2,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi//getSessionSlotCheckInterval" + "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,6 +22,26 @@ { "simulatorRequest": { "method": "GET", + "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "POST", + "path": "/ecompportal_att/auxapi/extendSessionTimeOuts" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "GET", "path": "/ecompportal_att/auxapi/context/get_user" }, "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json index 61ede56d1..50707ccb1 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" + "path": "/aai/v14/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json index abe4d2b5e..082a3bf4e 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" + "path": "/aai/v../network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json index 955f356d9..596104b83 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json @@ -38,7 +38,7 @@ { "operational-environment-id": "UUID of ECOMP Operational Environment", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json index 1d7849a6c..7fca48f10 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json @@ -6,7 +6,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip" + "file": "service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip" } }, { @@ -24,7 +24,7 @@ "invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a", "name": "vMMEvProbe_FE_AIC3-11.2.1_VF", "version": "1.0", - "toscaModelURL": "./service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip", + "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip", "category": "Application L4+", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json index 235c642ec..a5ea4e230 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1" + "path": "/aai/v../business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1" } , "simulatorResponse": { "responseCode": 404 diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json deleted file mode 100644 index 19d70d90b..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations/a53c9ca8-8986-44da-9e5e-9e4179e6c78a/activate", - "body": { - "val": "dummy payload" - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "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/mso_add_relationships.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json index 7b72f053a..c85b3cb63 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/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 202, 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 126369df3..f8f6fbbbd 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,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 500, 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 58d338726..c3fb0b009 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./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 f049d7662..27eb0dc98 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./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 09addafe9..021d012f6 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json deleted file mode 100644 index 0752cd15f..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations" - } , - "simulatorResponse": { - "responseCode": "<ERROR_CODE>", - "body": "<ERROR_PAYLOAD>" - } -}
\ No newline at end of file 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 b5e3f1883..d48d2ae78 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./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 f3985ef32..fa429c9e9 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./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 ee0453393..4ce1936c4 100644 --- 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/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json new file mode 100644 index 000000000..3b3f878f7 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json @@ -0,0 +1,18 @@ +{ + "simulatorRequest": { + "method" : "GET", + "path" : "/ecompportal_att/auxapi//v3/user/1" + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "firstName": "1", + "lastName": "1", + "orgId": 1, + "loginId": "1", + "loginPwd": "1", + "active": true, + "internal": true + } + } +}
\ No newline at end of file |