aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-08-28 16:27:42 +0300
committerIttay Stern <ittay.stern@att.com>2019-08-28 18:50:37 +0300
commit9d0908e18d51a4ba1c4a54b01fcbe16598bd352a (patch)
treef633e5fad0b8629abdb739a286706fb48c69ef40
parent7648b9f8c631b346d30132c2b0fa29b14365b83c (diff)
Fix legacy region in resume vfModule5.0.1
Issue-ID: VID-378 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Idad1357d8de234ad54716d8d51ac846a426a5258 Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js1
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js15
-rw-r--r--vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java3
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java21
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java4
5 files changed, 20 insertions, 24 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 ac6d84faf..2cfcf5715 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
@@ -82,6 +82,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
$scope.deleteOrResume = function() {
var msoParameterList = [({id: "lcpRegion", value: $scope.regionSelection.optionId})];
+ msoParameterList.push({id: FIELD.ID.LCP_REGION_TEXT, value: $scope.regionSelection.legacyRegion});
msoParameterList.push({id: "tenant", value: $scope.regionSelection.tenant});
var requestParams = {};
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 1a296ca5d..972463745 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
@@ -775,20 +775,13 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
};
var buildCloudConfiguration = function (parameterList) {
- var lcpRegion;
- var cloudOwner;
var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList);
var cloudOwnerAndLcpCloudRegion = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
- if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) {
- lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT,
- parameterList);
- cloudOwner = undefined;
- } else {
- var cloudOwnerAndLcpCloudRegion = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
- lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId;
- cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner;
- }
+ var cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner;
+ var lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT ?
+ getValueFromList(FIELD.ID.LCP_REGION_TEXT,parameterList) :
+ cloudOwnerAndLcpCloudRegion.cloudRegionId;
return {
lcpCloudRegionId: lcpRegion,
diff --git a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
index 30473888b..050aa752c 100644
--- a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
+++ b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
@@ -419,8 +419,7 @@ public class BulkRegistration {
SimulatorApi.registerExpectationFromPresets(
ImmutableList.of (
new PresetAAIGetTenants(),
- PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC,
- new PresetMSOCreateVfModule(serviceInstanceId,vnfInstanceId, ATT_NC),
+ new PresetMSOCreateVfModule(serviceInstanceId,vnfInstanceId, DEFAULT_CLOUD_OWNER),
new PresetMSOOrchestrationRequestGet(
COMPLETE,
"c0011670-0e1a-4b74-945d-8bf5aede1d9c",
diff --git a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
index ca8c27655..92b01d17c 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
@@ -1,15 +1,24 @@
package vid.automation.test.test;
+import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_CLOUD_OWNER;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.MDT_1;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_SOME_LEGACY_REGION_TO_ATT_AIC;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.SOME_LEGACY_REGION;
+import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
+
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import java.util.List;
+import java.util.stream.Collectors;
import org.junit.Assert;
+import org.onap.sdc.ci.tests.datatypes.UserCredentials;
+import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleOldViewEdit;
import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteOldViewEdit;
import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVolumeGroupOldViewEdit;
-import org.onap.sdc.ci.tests.datatypes.UserCredentials;
-import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
import org.openqa.selenium.WebElement;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -24,12 +33,6 @@ import vid.automation.test.sections.ViewEditPage;
import vid.automation.test.services.ServicesService;
import vid.automation.test.services.SimulatorApi;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.*;
-import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
-
public class ALaCarteflowTest extends CreateInstanceDialogBaseTest {
static final String SUBSCRIBER = "Emanuel";
@@ -84,7 +87,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest {
VNF_ID,
vfModuleName,
msoTestApiValue,
- ATT_NC)),
+ DEFAULT_CLOUD_OWNER)),
SimulatorApi.RegistrationStrategy.APPEND);
diff --git a/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java b/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java
index a334646cc..c26cdb666 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java
@@ -16,7 +16,7 @@ public class DeleteResumeTest extends CreateInstanceDialogBaseTest {
SimulatorApi.clearAll();
BulkRegistration.resumeVfModule(serviceInstanceId,vnfInstanceId);
navigateToViewEditPageOfuspVoiceVidTest444("240376de-870e-48df-915a-31f140eedd2c");
- resumeVFModule("aa","AAIAIC25", "AIC", "092eb9e8e4b7412e8787dd091bc58e86","mdt1",user.tenants);
+ resumeVFModule("aa","AAIAIC25", "AIC", "092eb9e8e4b7412e8787dd091bc58e86","hvf6",user.tenants);
}
-} \ No newline at end of file
+}