import static org.hamcrest.MatcherAssert.assertThat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
+import static vid.automation.test.infra.Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI;
+import static vid.automation.test.infra.Features.FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI;
import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI;
+import static vid.automation.test.infra.Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION;
+import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE;
import static vid.automation.test.infra.ModelInfo.aLaCarteForBrowseSdc;
import static vid.automation.test.infra.ModelInfo.aLaCarteServiceCreationTest;
import static vid.automation.test.infra.ModelInfo.instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.hamcrest.Matchers;
+import org.jetbrains.annotations.NotNull;
import org.onap.sdc.ci.tests.datatypes.UserCredentials;
import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.testng.Assert;
+import org.testng.TimeBombSkipException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import vid.automation.test.infra.Click;
import vid.automation.test.infra.Exists;
import vid.automation.test.infra.FeatureTogglingTest;
-import vid.automation.test.infra.Features;
import vid.automation.test.infra.Get;
import vid.automation.test.infra.ModelInfo;
import vid.automation.test.infra.SelectOption;
import vid.automation.test.model.Service;
import vid.automation.test.model.User;
import vid.automation.test.sections.BrowseASDCPage;
-import vid.automation.test.sections.DeployMacroDialogBase;
-import vid.automation.test.sections.DeployMacroDialogOld;
import vid.automation.test.sections.SideMenu;
import vid.automation.test.sections.ViewEditPage;
+import vid.automation.test.sections.deploy.DeployDialogBase;
+import vid.automation.test.sections.deploy.DeployModernUIALaCarteDialog;
+import vid.automation.test.sections.deploy.DeployModernUIMacroDialog;
+import vid.automation.test.sections.deploy.DeployOldALaCarteDialog;
+import vid.automation.test.sections.deploy.DeployOldMacroDialog;
import vid.automation.test.services.ServicesService;
import vid.automation.test.services.SimulatorApi;
public class BrowseASDCTest extends CreateInstanceDialogBaseTest {
private final String invariantUUIDAlacarte = aLaCarteForBrowseSdc.modelInvariantId;
private final String invariantUUIDMacro = macroForBrowseSdc.modelInvariantId;
- private final String instantiationTypeNameAlacarte = "a la carte";
- private final String instantiationTypeNameMacro = "macro";
- private final String oldMacro = "old macro";
- private final String newAlacarte = "new a la carte";
public static final String modelInvariantUUID1 = "aeababbc-010b-4a60-8df7-e64c07389466";
public static final String modelInvariantUUID2 = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc";
public static final String modelInvariantUUID3 = "d849c57d-b6fe-4843-8349-4ab8bbb08d71";
return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_EMANUEL, "", "");
}
- @Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
+ //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
public void testPNFOnCreatePopup() {
Service service = servicesService.getService("f39389e4-2a9c-4085-8ac3-04aea9c651be");
BrowseASDCPage browseASDCPage = new BrowseASDCPage();
validateServiceCreationDialog(service);
}
-// @BeforeMethod
-// public void clearSimulator() {
-// SimulatorApi.clearAll();
-// }
- @Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
+
+ //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
private void testPNFMacroInstantation() throws Exception {
User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL);
relogin(user.credentials);
}
@Test
- private void browseServiceModel_deployServiceALaCarteByBackendInput_creationPopupIsALaCarte() throws Exception {
+ private void browseServiceModel_deployServiceALaCarteByBackendInput_creationPopupIsALaCarte() {
// model uuid should be of macro
deployServiceAndAssertInstantiationType(
"csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip",
invariantUUIDMacro,
- instantiationTypeNameAlacarte
+ getAlacarteDialogByFlagValue()
);
}
+ @NotNull
+ private DeployDialogBase getAlacarteDialogByFlagValue() {
+ return FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() ?
+ new DeployModernUIALaCarteDialog() :
+ new DeployOldALaCarteDialog();
+ }
+
@Test
@FeatureTogglingTest(FLAG_5G_IN_NEW_INSTANTIATION_UI)
- private void browseServiceModel_deployServiceALaCarteByBackendInputHintNewUI_creationPopupIsAngular2() throws Exception {
+ private void browseServiceModel_deployServiceALaCarteByBackendInputHintNewUI_creationPopupIsAngular2() {
deployServiceAndAssertInstantiationType(
instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID,
- newAlacarte
+ new DeployModernUIALaCarteDialog()
);
}
@Test
- private void browseServiceModel_deployServiceALaCarteBecauseNotOnMACRO_SERVICESConfig_creationPopupIsALaCarte() throws Exception {
+ private void browseServiceModel_deployServiceALaCarteBecauseNotOnMACRO_SERVICESConfig_creationPopupIsALaCarte() {
deployServiceAndAssertInstantiationType(
"csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip",
invariantUUIDAlacarte,
- instantiationTypeNameAlacarte
+ getAlacarteDialogByFlagValue()
);
}
@Test
- private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro() throws Exception {
+ private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro() {
deployServiceAndAssertInstantiationType(
"csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip",
invariantUUIDAlacarte,
- instantiationTypeNameMacro
+ new DeployModernUIMacroDialog()
);
}
@Test
- private void browseServiceModel_deployServiceMacroByMACRO_SERVICESConfig_creationPopupIsOldMacro() throws Exception {
+ private void browseServiceModel_deployServiceMacroByMACRO_SERVICESConfig_creationPopupIsOldMacro() {
+ if (FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() ) {
+ throw new TimeBombSkipException("skipping identify macro by uuid for awhile", "2019/11/25");
+ //also need to handle the simulator preset by using good ModelInfo instance
+ }
deployServiceAndAssertInstantiationType(
"csar15782222_invariantUUIDMacro.zip",
invariantUUIDMacro,
- oldMacro
-
+ new DeployOldMacroDialog()
);
}
@Test
- private void browseServiceModel_deployServiceMacroWithPnf_creationPopupIsOldMacro() throws Exception {
+ private void browseServiceModel_deployServiceMacroWithPnf_creationPopupIsOldMacro() {
deployServiceAndAssertInstantiationType(
"csar15782222_instantiationTypeMacroWithPnf.zip",
invariantUUIDMacro,
- oldMacro
-
+ new DeployOldMacroDialog()
);
}
@Test
- private void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() throws Exception {
+ public void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() {
deployServiceAndAssertInstantiationType(
- "csar15782222_instantiationTypeMacroWithCR.zip",
- invariantUUIDMacro,
- oldMacro
-
+ ModelInfo.collectionResourceService,
+ FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI.isActive() ?
+ new DeployModernUIMacroDialog() :
+ new DeployOldMacroDialog()
);
}
@Test
- private void browseServiceModel_deployServiceMacroWithNetwork_creationPopupIsMacroByFF() throws Exception {
- String macroInstantiationAccordingFF = Features.FLAG_ASYNC_INSTANTIATION.isActive() && Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ? instantiationTypeNameMacro : oldMacro;
+ private void browseServiceModel_deployServiceMacroWithNetwork_creationPopupIsMacroByFF() {
deployServiceAndAssertInstantiationType(
"csar15782222_instantiationTypeMacroWithNetwork.zip",
invariantUUIDMacro,
- macroInstantiationAccordingFF
+ FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ?
+ new DeployModernUIMacroDialog() :
+ new DeployOldMacroDialog()
);
}
- private void deployServiceAndAssertInstantiationType(String modelZipFileName, String modelInvariantId, String expectedInstantiationType) throws Exception {
- deployServiceAndAssertInstantiationType(new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e", modelInvariantId, modelZipFileName), expectedInstantiationType);
+ private void deployServiceAndAssertInstantiationType(String modelZipFileName, String modelInvariantId, DeployDialogBase deployDialog) {
+ deployServiceAndAssertInstantiationType(new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e", modelInvariantId, modelZipFileName), deployDialog);
}
- private void deployServiceAndAssertInstantiationType(ModelInfo modelInfo, String expectedInstantiationType) throws Exception {
+ private void deployServiceAndAssertInstantiationType(ModelInfo modelInfo, DeployDialogBase deployDialog) {
registerExpectationForLegacyServiceDeployment(modelInfo, "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL);
GeneralUIUtils.ultimateWait();
browseASDCPage.clickDeployServiceButtonByServiceUUID(modelInfo.modelVersionId);
- DeployMacroDialogBase macroDialog = null;
- if (expectedInstantiationType.equals(instantiationTypeNameAlacarte)) {
- GeneralUIUtils.ultimateWait();
- browseASDCPage.clickCancelButtonByTestID();
- } else { //macro
- macroDialog = expectedInstantiationType.equals(oldMacro) ? new DeployMacroDialogOld() : getMacroDialog();
- macroDialog.assertTitle();
- macroDialog.closeDialog();
- }
+
+ deployDialog.waitForDialogToLoad();
+ deployDialog.assertDialog();
+ deployDialog.closeDialog();
}
+ @FeatureTogglingTest(value = FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI, flagActive = false)
@Test
- private void testServiceInstantiationAlaCarte() throws Exception {
+ private void testServiceInstantiationAlaCarte() {
User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL);
relogin(user.credentials);
BrowseASDCPage browseASDCPage = registerSimulatorAndGoToBrowseSDC();
Service service = servicesService.getService("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd");
browseASDCPage.clickDeployServiceButtonByServiceUUID(service.uuid);
- DeployMacroDialogBase deployMacroDialog = getMacroDialog();
- deployMacroDialog.assertDialogExists();
+ DeployModernUIMacroDialog deployMacroDialog = new DeployModernUIMacroDialog();
+ deployMacroDialog.waitForDialogToLoad();
+ deployMacroDialog.assertDialog();
deployMacroDialog.clickProjectSelect();
deployMacroDialog.clickOwningEntitySelect();
}
return new BrowseASDCPage();
}
- @Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
+ //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
private void testOwningEntityRequiredAndProjectOptional() throws Exception {
User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA);
relogin(user.credentials);
assertSuccessfulServiceInstanceCreation();
}
- @Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
+ //@Test(groups = {"shouldBeMigratedToWorkWithSimulator"})
protected void testLineOfBusinessOptionalAndPlatformRequired() throws Exception {
User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA);
viewEditPage.selectNodeInstanceToAdd("VID-RODERICK-05-15-17 0");
viewEditPage.generateAndSetInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX);
viewEditPage.selectProductFamily("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
- viewEditPage.selectLcpRegion("JANET25", "AIC");
+ viewEditPage.selectLcpRegion("AAIAIC25", "AIC");
viewEditPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86");
viewEditPage.setLegacyRegion("llkjhlkjhlkjh");
assertFalse(Exists.tagNameInAnotherElement(serviceModelsTbody, "tr"), "Table should be empty on empty results");
resetGetServicesCache();
}
+
+ private static final String[] macroModelsIds = {
+ "f1bde010-cc5f-4765-941f-75f15b24f9fc",
+ "lmoser410-connector-model-version-id",
+ "ipe-resource-id-ps-02",
+ "797a6c41-0f80-4d35-a288-3920c4e06baa",
+ };
+ private static final String[] alacarteModelsIds = {
+ "0903e1c0-8e03-4936-b5c2-260653b96413",
+ "666a06ee-4b57-46df-bacf-908da8f10c3f",
+ "20c4431c-246d-11e7-93ae-92361f002671",
+ };
+
+ @DataProvider
+ public static Object[][] filterOrchestrationType() {
+ return new Object[][]{{"a la carte", 3, alacarteModelsIds},{"macro", 4, macroModelsIds}};
+ }
+
+ @Test(dataProvider = "filterOrchestrationType")
+ @FeatureTogglingTest(FLAG_SHOW_ORCHESTRATION_TYPE)
+ public void browseSdcModel_filterModelsWithOrchestrationType_alacarte(
+ String orchestrationType,int numberOfOccurrence, String[] expectedModelsIds) {
+ resetGetServicesCache();
+ SimulatorApi.clearAll();
+ BrowseASDCPage browseAsdcPage = registerSimulatorAndGoToBrowseSDC();
+ GeneralUIUtils.ultimateWait();
+ assertThat(browseAsdcPage.countCurrentRowsInTable(),(Matchers.greaterThan(numberOfOccurrence)));
+ browseAsdcPage.fillFilterText(orchestrationType);
+ Assert.assertEquals(browseAsdcPage.countCurrentRowsInTable(),numberOfOccurrence);
+ for(String id : expectedModelsIds) {
+ Assert.assertTrue(browseAsdcPage.isModelWithGivenServiceUUIDVisible(id));
+ }
+ browseAsdcPage.fillFilterText("");
+ }
+
}
Code Review / vid.git / blobdiff