Handling legacy region in vfModule creation

Issue-ID: VID-482

Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I2c55587d86a77eb0c6c2fa410b212efb074894e2

5 files changed, 13 insertions, 22 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 87f0f301d..3b5384e14 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
@@ -47,6 +47,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
         AaiService.getLcpCloudRegionTenantList(DataService
             .getGlobalCustomerId(), DataService.getServiceType(), function(
             response) {
+            DataService.setCloudRegionTenantList(response);
             $scope.lcpAndTenant = response;
             $scope.isFeatureFlagCloudOwner = featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST);
             $scope.lcpRegionList = _.uniqBy(response, 'cloudRegionId');
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
index 17adf77ce..1949f5aa2 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
@@ -626,8 +626,6 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
 
     var getMsoRequestDetails = function(parameterList) {
         console.log("getMsoRequestDetails invoked, parameterList="); console.log(JSON.stringify(parameterList,null,4));
-        //console.log("getMsoRequestDetails invoked, DataService.getArbitraryParameters()=");
-        //console.log(JSON.stringify(DataService.getArbitraryParameters(),null,4));
 
         //VoLTE logic goes here
         if(DataService.getE2EService() === true) {
@@ -781,8 +779,8 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
         var cloudOwner;
 
         var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList);
-
-        if (lcpRegionOptionId === FIELD.KEY.LCP_REGION_TEXT) {
+        var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
+        if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) {
             lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT,
                 parameterList);
             cloudOwner = undefined;
@@ -1258,7 +1256,9 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
                 parameterListControl
                     .updateList([ FIELD.PARAMETER.TENANT_DISABLED ]);
             }
-            if (list[0].value === FIELD.KEY.LCP_REGION_TEXT) {
+
+            var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(list[0].value);
+            if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) {
                 parameterListControl
                     .updateList([ FIELD.PARAMETER.LCP_REGION_TEXT_VISIBLE ]);
             } else {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
index 36e962b73..817bef670 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
@@ -45,12 +45,6 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
 	};
 	
 	var getLcpCloudRegionTenantList = function() {
-		//console.log ( "global customer id: " ); 
-		//console.log ( JSON.stringify (DataService.getGlobalCustomerId()) );
-		
-		//console.log ( "service type: " ); 
-		//console.log ( JSON.stringify (DataService.getServiceType()) );
-		
 		AaiService.getLcpCloudRegionTenantList(DataService
 				.getGlobalCustomerId(), DataService.getServiceType(), function(
 				response) {
diff --git a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
index 65d0fb6a0..5b7239a12 100644
--- a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
@@ -185,10 +185,15 @@ public class VidBasePage {
         return this;
     }
 
-
     public VidBasePage selectLcpRegion(String lcpRegion) {
+        return selectLcpRegion(lcpRegion, "AIC");
+    }
+
+    public VidBasePage selectLcpRegion(String lcpRegion, String cloudOwner) {
         GeneralUIUtils.ultimateWait();
-        SelectOption.byValue(lcpRegion, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
+        String visibleText = (Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive()) ?
+            String.format("%s (%s)", lcpRegion, cloudOwner) : lcpRegion;
+        SelectOption.byTestIdAndVisibleText(visibleText, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
         return this;
     }
 
diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
index 4edabf53d..adba6f28f 100644
--- a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
@@ -67,15 +67,6 @@ public class ViewEditPage extends VidBasePage {
         return this;
     }
 
-    public ViewEditPage selectLcpRegion(String lcpRegion, String cloudOwner){
-        selectLcpRegion(lcpRegion);
-        if (Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive()) {
-            String selectedOption = SelectOption.getSelectedOption(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
-            Assert.assertEquals(lcpRegion + " (" + cloudOwner.toUpperCase() + ")", selectedOption);
-        }
-        return this;
-    }
-
     public ViewEditPage selectLineOfBusiness(String lineOfBusiness, String cloudOwner){
         selectLineOfBusiness(lineOfBusiness);
         return this;