change operational-environment-type on operational-environments query

Issue-ID: VID-637
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: Ia9340269dd6a4a6616a6fdbfe166eea0731490de

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 5311195..352fa20 100644 (file)
--- 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 137d0de..3a91c46 100644 (file)
--- 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 ad8e3c0..bce504a 100644 (file)
--- 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 fece3ff..ebfa81f 100644 (file)
--- 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 2b5c923..0fa8c3c 100644 (file)
--- 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 968f2d0..deaf1c1 100644 (file)
--- 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 a793f7c..e49150e 100644 (file)
--- 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",