From f4dff328c0386c8901b5841943b11f0c13b3169f Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 8 Jul 2019 15:46:44 +0300 Subject: Merge from ecomp 718fd196 - Integration Tests Issue-ID: VID-378 Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489 Signed-off-by: Ittay Stern --- .../resources/registration_to_simulator/aai_get_pnf_by_region.json | 4 ++-- .../registration_to_simulator/aai_get_pnf_by_region_error.json | 4 ++-- .../body_jsons/mso_request_create_configuration.json | 2 +- .../ecompportal_getSessionSlotCheckInterval.json | 4 ++-- .../registration_to_simulator/get_operational_environments_aai.json | 4 ++-- .../get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json | 2 +- .../test/resources/registration_to_simulator/portal_remote_users.json | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'vid-automation/src/test/resources/registration_to_simulator') 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 74b8637aa..ef7396590 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 @@ -6,8 +6,8 @@ "format": ["simple"] }, "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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/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" } } , "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 386c982c0..34ffff414 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 @@ -6,8 +6,8 @@ "format": ["simple"] }, "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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/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" } } , "simulatorResponse": { 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 c726590eb..ca175834b 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 @@ -10,7 +10,7 @@ "modelCustomizationName": "Port Mirroring Configuration By Policy 1" }, "cloudConfiguration": { - "lcpCloudRegionId": "JANET25" + "lcpCloudRegionId": "AAIAIC25" }, "requestInfo": { "instanceName": "dummy_instance", 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 a71270e72..18643d792 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//v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,7 +22,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, 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 596104b83..968f2d00c 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 @@ -10,7 +10,7 @@ "operational-environment-id": "UUID_of_Operational_Environment", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -39,7 +39,7 @@ "operational-environment-id": "UUID of ECOMP Operational Environment", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json index 7fca48f10..d1bc1dbaf 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json @@ -22,7 +22,7 @@ "body": { "uuid": "245562de-3984-49ef-a708-6c9d7cfcabd1", "invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a", - "name": "vMMEvProbe_FE_AIC3-11.2.1_VF", + "name": "vFLORENCEvProbe_FE_AIC3-11.2.1_VF", "version": "1.0", "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip", "category": "Application L4+", 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 index 3b3f878f7..b8aea08ba 100644 --- 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 @@ -1,7 +1,7 @@ { "simulatorRequest": { "method" : "GET", - "path" : "/ecompportal_att/auxapi//v3/user/1" + "path" : "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/user/1" } , "simulatorResponse": { "responseCode": 200, -- cgit 1.2.3-korg