From: Alexey Sandler <alexey.sandler@intl.att.com>
Date: Thu, 22 Aug 2019 12:16:48 +0000 (+0300)
Subject: Fix to vf-module-homing-data-action controller to retrieve the cloudRegionId
X-Git-Tag: 5.0.1~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=453a7bdf940a5006513216f4cc1fcd89ef4bbd44;p=vid.git

Fix to vf-module-homing-data-action controller to retrieve the cloudRegionId

Issue-ID: VID-378
Change-Id: I6042e72c9ebb8508b822df276da1b8549501042c
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---

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 a7f7e9128..b6725b124 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
@@ -30,7 +30,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
     $scope.vfModuleName = vfModule.name;
     $scope.volumeGroups = vfModule.volumeGroups;
     $scope.lcpAndTenant = null;
-    $scope.regionSelection = {lcpRegion: null, legacyRegion: null, tenant: null};
+    $scope.regionSelection = {optionId: null, legacyRegion: null, tenant: null};
     $scope.lcpRegionList = null;
     $scope.isHomingData = false;
     $scope.megaRegion = ['AAIAIC25'];
@@ -60,12 +60,12 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
             .then(function (res) {
                 if (res && res.data) {
                     $scope.regionSelection = {
-                        lcpRegion: (res.data[COMPONENT.CLOUD_REGION_ID]) ? res.data[COMPONENT.CLOUD_REGION_ID] : null,
+                        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.lcpRegion !== null && res.data.tenant !== null;
-                    $scope.isHomingData = $scope.isHomingData && (($scope.megaRegion).indexOf($scope.regionSelection.lcpRegion) === -1);
+                    $scope.isHomingData = $scope.regionSelection.optionId !== null && res.data.tenant !== null;
+                    $scope.isHomingData = $scope.isHomingData && !$scope.selectedLcpRegionIsMegaRegion();
                 }
 
                 if (!$scope.isHomingData) {
@@ -75,11 +75,11 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
             .catch(function (error) {
                 getLcpCloudRegionTenantList();
             });
-    };
+    }
 
     function getLcpRegionId()  {
         if(_.isEmpty($scope.regionSelection.legacyRegion)) {
-            return $scope.regionSelection.lcpRegion
+            return DataService.getCloudOwnerAndLcpCloudRegionFromOptionId($scope.regionSelection.optionId).cloudRegionId;
         }
         return $scope.regionSelection.legacyRegion;
     }
@@ -144,6 +144,12 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
         return AaiService.removeVendorFromCloudOwner(cloudOwner)
     };
 
+    $scope.selectedLcpRegionIsMegaRegion = function() {
+        let cloudRegionId =
+            DataService.getCloudOwnerAndLcpCloudRegionFromOptionId($scope.regionSelection.optionId).cloudRegionId;
+        return ($scope.megaRegion).indexOf(cloudRegionId) > -1
+    };
+
     $scope.cancel = function() {
         $uibModalInstance.dismiss('cancel');
     };
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
index 3fbe07e83..944352403 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
@@ -55,7 +55,7 @@
             <div class="lcp-region field">
                 <label>LCP Region</label>
                 <select name="lcp-region" required class="form-item wide"
-                        data-tests-id="lcpRegion" data-ng-model="regionSelection.lcpRegion"
+                        data-tests-id="lcpRegion" data-ng-model="regionSelection.optionId"
                         data-ng-change="regionSelection.tenant = null; regionSelection.legacyRegion = null;">
                     <option class="lcp-region-placeholder" value="" selected>Select LCP Region</option>
                     <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionOptionId}}"
@@ -69,7 +69,7 @@
                 </select>
             </div>
 
-            <div class="legacy-region field" data-ng-if="(megaRegion).indexOf(regionSelection.lcpRegion) > -1">
+            <div class="legacy-region field" data-ng-if="selectedLcpRegionIsMegaRegion()">
                 <label>Legacy Region</label>
                 <input type="text" data-tests-id="lcpRegionText" required data-ng-model="regionSelection.legacyRegion"
                        placeholder="Enter legacy region">
@@ -81,7 +81,7 @@
                         data-tests-id="tenant" data-ng-model="regionSelection.tenant">
                     <option class="tenant-placeholder" value="" selected>Select Tenant Name</option>
                     <option ng-repeat="option in lcpAndTenant" class="tenantOption" value="{{option.tenantId}}"
-                            data-ng-if="option.isPermitted && option.cloudRegionOptionId === regionSelection.lcpRegion">{{option.tenantName}}
+                            data-ng-if="option.isPermitted && option.cloudRegionOptionId === regionSelection.optionId">{{option.tenantName}}
                     </option>
                 </select>
             </div>
diff --git a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
index 02bc2728d..b83268ece 100644
--- a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
@@ -1,6 +1,5 @@
 ///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
 import {JsonBuilder} from '../../support/jsonBuilders/jsonBuilder';
-import {PnfModel} from '../../support/jsonBuilders/models/pnf.model';
 import {ServiceModel} from '../../support/jsonBuilders/models/service.model';
 import {AaiServiceInstancesModel} from '../../support/jsonBuilders/models/serviceInstances.model';
 import {AAISubDetailsModel} from '../../support/jsonBuilders/models/aaiSubDetails.model';
@@ -76,7 +75,7 @@ describe('Soft delete tests', function () {
 
     it(`Resume button display in orch status - pendingactivation, assigned - feature FLAG_VF_MODULE_RESUME_STATUS_CREATE - is OFF`, function () {
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
+      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then(() => {
         cy.server()
           .route({
             method: 'GET',
@@ -121,17 +120,17 @@ describe('Soft delete tests', function () {
       cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
       cy.wait('@service-complexService');
       checkSoftDeleteAndDeletePopup('gg', 'vfModuleTreeNode-assigned', false, true);
-      cy.selectDropdownOptionByText('lcpRegion', 'AAIAIC25');
+      cy.selectDropdownOptionByText('lcpRegion', 'AAIAIC25 (AIC)');
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('have.attr', 'disabled');
       cy.typeToInput("lcpRegionText", "just another region");
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('have.attr', 'disabled');
       cy.selectDropdownOptionByText('tenant', 'USP-SIP-IC-24335-T-01');
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('not.have.attr', 'disabled');
-      cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
+      cy.selectDropdownOptionByText('lcpRegion', 'hvf6 (AIC)');
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('have.attr', 'disabled');
       cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-testalexandria');
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('not.have.attr', 'disabled');
-      cy.getElementByDataTestsId('cancel').click({force: true})
+      cy.getElementByDataTestsId('cancel').click({force: true});
       cy.getElementByDataTestsId('confirmResumeDeleteButton').should('not.be.visible');
     });
 
@@ -190,10 +189,10 @@ describe('Soft delete tests', function () {
     });
 
     function checkLegacyRegion() {
-      checkIsLegacyRegionTextIsDisplay('AAIAIC25', true);
-      checkIsLegacyRegionTextIsDisplay('olson3', false);
-      checkIsLegacyRegionTextIsDisplay('olson5a', false);
-      checkIsLegacyRegionTextIsDisplay('hvf6', false);
+      checkIsLegacyRegionTextIsDisplay('AAIAIC25 (AIC)', true);
+      checkIsLegacyRegionTextIsDisplay('olson3 (AIC)', false);
+      checkIsLegacyRegionTextIsDisplay('olson5a (AIC)', false);
+      checkIsLegacyRegionTextIsDisplay('hvf6 (AIC)', false);
     }
 
     function checkIsLegacyRegionTextIsDisplay(lcpRegionName: string, isVisible: boolean) {