From 726807cedcfde00b448f3c60656d6c9b7c1d9d1f Mon Sep 17 00:00:00 2001
From: Alexey Sandler <alexey.sandler@intl.att.com>
Date: Thu, 10 Oct 2019 13:06:11 +0300
Subject: [PATCH] fix call AAI get vnf data with right cloudRegion id

Issue-ID: VID-596
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I9879657abdc23d91370ed12736d177884963448a
---
 .../scripts/modals/new-change-management/new-change-management.html   | 4 ++--
 .../src/main/java/vid/automation/test/test/ChangeManagementTest.java  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
index 3f2489dbb..d3cb239e6 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
@@ -82,10 +82,10 @@
                     <select name="cloudRegion" class="form-control" ng-model="vm.changeManagement.cloudRegion"  data-tests-id="cloudRegion" id="cloudRegion"
                             data-ng-disabled="newChangeManagement.serviceType.$pristine">
                         <option value="" >select cloud Region</option>
-                        <option ng-repeat="option in cloudRegionList" value="{{option.tenantId}}"
+                        <option ng-repeat="option in cloudRegionList" value="{{option.cloudRegionId}}"
                                 data-ng-if="option.isPermitted && !isFeatureFlagCloudOwner">{{option.cloudRegionId}}
                         </option>
-                        <option ng-repeat="option in cloudRegionList" value="{{option.tenantId}}"
+                        <option ng-repeat="option in cloudRegionList" value="{{option.cloudRegionId}}"
                                 data-ng-if="option.isPermitted && isFeatureFlagCloudOwner">
                             {{option.cloudRegionId}} ({{removeVendorFromCloudOwner(option.cloudOwner).toUpperCase()}})
                         </option>
diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
index d9c771b6f..ef13fcea5 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
@@ -23,7 +23,6 @@ import com.aventstack.extentreports.Status;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.primitives.Ints;
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -34,7 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import net.javacrumbs.jsonunit.core.Option;
 import org.json.JSONException;
 import org.junit.Assert;
@@ -233,7 +231,7 @@ public class ChangeManagementTest extends VidBaseTestCase {
                     SIMPLE,
                     "/business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
                             + serviceType + "/service-instances",
-                    "query/vnfs-fromServiceInstance-filterByCloudRegion?nfRole=vMobileDNS&cloudRegionID=092eb9e8e4b7412e8787dd091bc58e86"
+                    "query/vnfs-fromServiceInstance-filterByCloudRegion?nfRole=vMobileDNS&cloudRegionID=AAIAIC25"
             ) {
                 @Override
                 public Object getResponseBody() {
-- 
2.16.6