diff options
7 files changed, 18 insertions, 18 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js index 53111950c..352fa2019 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js @@ -36,7 +36,7 @@ }; var loadEcompEnvironmentsList = function () { - TestEnvironmentsService.loadAAIestEnvironments("ONAP") + TestEnvironmentsService.loadAAIestEnvironments("ECOMP") .then(function(response) { vm.environments = response.operationalEnvironment; }) diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json index 137d0de30..3a91c46a3 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -84,4 +84,4 @@ } ]} } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json index ad8e3c09a..bce504a24 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "INACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -84,4 +84,4 @@ } ]} } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json index fece3ffd1..ebfa81f82 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "INACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -84,4 +84,4 @@ } ]} } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json index 2b5c92332..0fa8c3ca9 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json +++ b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json @@ -107,7 +107,7 @@ "method": "GET", "path": "/aai/v../cloud-infrastructure/operational-environments", "queryParams": { - "operational-environment-type": "ONAP" + "operational-environment-type": "ECOMP" } }, "simulatorResponse": { @@ -117,7 +117,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -126,7 +126,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", 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 968f2d00c..deaf1c1b6 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,11 +38,11 @@ { "operational-environment-id": "UUID of ECOMP Operational Environment", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" }]} } -}
\ No newline at end of file +} diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json index a793f7cf7..e49150ee5 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/environment/get_operational_environments_aai.json @@ -134,7 +134,7 @@ "method": "GET", "path": "/aai/v../cloud-infrastructure/operational-environments", "queryParams": { - "operational-environment-type": "ONAP" + "operational-environment-type": "ECOMP" } }, "simulatorResponse": { @@ -144,7 +144,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "operational_environment_ec", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -153,7 +153,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "operational_environment_ed", - "operational-environment-type": "ONAP", + "operational-environment-type": "ECOMP", "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", |