get cloudOptionId from getHomingData

Issue-ID: VID-378
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ifa5cb0a827161f62b104bf18605531a2ebb29494

1 files changed, 10 insertions, 10 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
index b6725b124..ecc6042b6 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
@@ -59,13 +59,10 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
         AaiService.getHomingData(DataService.getVnfInstanceId(), DataService.getVfModuleInstanceId())
             .then(function (res) {
                 if (res && res.data) {
-                    $scope.regionSelection = {
-                        optionId: (res.data[COMPONENT.CLOUD_REGION_ID]) ? res.data[COMPONENT.CLOUD_REGION_ID] : null,
-                        legacyRegion: null,
-                        tenant: (res.data[COMPONENT.TENANT_ID]) ? res.data[COMPONENT.TENANT_ID] : null
-                    };
-                    $scope.isHomingData = $scope.regionSelection.optionId !== null && res.data.tenant !== null;
-                    $scope.isHomingData = $scope.isHomingData && !$scope.selectedLcpRegionIsMegaRegion();
+                    $scope.regionSelection.optionId = (res.data.cloudRegionOptionId);
+                    $scope.regionSelection.tenant = (res.data[COMPONENT.TENANT_ID]) ? res.data[COMPONENT.TENANT_ID] : null;
+                    $scope.isHomingData = $scope.regionSelection.optionId !== null && $scope.regionSelection.tenant !== null;
+                    $scope.isHomingData = $scope.isHomingData && (($scope.megaRegion).indexOf(res.data[COMPONENT.CLOUD_REGION_ID]) === -1);
                 }
 
                 if (!$scope.isHomingData) {
@@ -145,9 +142,12 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
     };
 
     $scope.selectedLcpRegionIsMegaRegion = function() {
-        let cloudRegionId =
-            DataService.getCloudOwnerAndLcpCloudRegionFromOptionId($scope.regionSelection.optionId).cloudRegionId;
-        return ($scope.megaRegion).indexOf(cloudRegionId) > -1
+        if ($scope.regionSelection.optionId) {
+            let cloudRegionId = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId($scope.regionSelection.optionId).cloudRegionId;
+            return ($scope.megaRegion).indexOf(cloudRegionId) > -1
+        } else {
+            return false;
+        }
     };
 
     $scope.cancel = function() {