summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js9
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java7
2 files changed, 9 insertions, 7 deletions
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 817bef670..aac0ed468 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
@@ -293,13 +293,12 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
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;
} else {
- var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId;
cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner;
}
@@ -478,7 +477,9 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
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-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
index 59c132367..df3ef9436 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
@@ -2,12 +2,12 @@ package vid.automation.test.test;
import com.google.common.collect.ImmutableList;
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.aai.PresetAAIGetCloudOwnersByCloudRegionId;
import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut;
import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateMacroPre1806Post;
-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.Test;
@@ -18,6 +18,7 @@ import vid.automation.test.sections.BrowseASDCPage;
import vid.automation.test.sections.SideMenu;
import vid.automation.test.services.SimulatorApi;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc;
import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
@@ -82,7 +83,7 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
browseASDCPage.clickDeployServiceButtonByServiceUUID(macroForBrowseSdc.modelVersionId);
WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30);
- Assert.assertThat(modalTitle.getText().toLowerCase(), containsString("macro"));
+ assertThat(modalTitle.getText().toLowerCase(), containsString("macro"));
GeneralUIUtils.ultimateWait();
assertServiceDetails();