diff options
Diffstat (limited to 'ui-ci/src/main')
13 files changed, 100 insertions, 186 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java index 913064b7fd..8fd3c469be 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java @@ -57,7 +57,7 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { public void importVfvArtifactsDeploymentArtifactsMultipleArtifactsMultipleTypes() throws Exception { if(true){ - throw new SkipException("Open bug 197126"); + throw new SkipException("Due to the new design the test should be updated accordingly"); } String filePath = FileHandling.getFilePath(folder); @@ -118,7 +118,7 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { public void importVfcArtifactsInformationalArtifactsOnSingleVfc() throws Exception { if(true){ - throw new SkipException("Open bug 197126"); + throw new SkipException("Due to the new design the test should be updated accordingly"); } String filePath = FileHandling.getFilePath(folder); @@ -152,7 +152,7 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { public void importVfcArtifactsDeploymentAndInformationalArtifactsMultipleVfcs() throws Exception { if(true){ - throw new SkipException("Open bug 197126"); + throw new SkipException("Due to the new design the test should be updated accordingly"); } String filePath = FileHandling.getFilePath(folder); @@ -212,7 +212,7 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { public void importVfcArtifactsDeploymentArtifactsExtraFolderUnderVfcIdentification() throws Exception { if(true){ - throw new SkipException("Open bug 197126"); + throw new SkipException("Due to the new design the test should be updated accordingly"); } String filePath = FileHandling.getFilePath(folder); @@ -254,7 +254,7 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { public void importVfcArtifactsDeploymentArtifactsInvalidArtifactType() throws Exception { if(true){ - throw new SkipException("Open bug 197126"); + throw new SkipException("Due to the new design the test should be updated accordingly"); } String filePath = FileHandling.getFilePath(folder); diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/DeploymentViewTests.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/DeploymentViewTests.java index 87bf7b0506..2e25eddd2c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/DeploymentViewTests.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/DeploymentViewTests.java @@ -43,6 +43,7 @@ import org.openecomp.sdc.ci.tests.utilities.ResourceUIUtils; import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; import org.openecomp.sdc.ci.tests.verificator.DeploymentViewVerificator; import org.openqa.selenium.WebElement; +import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -152,7 +153,8 @@ public class DeploymentViewTests extends SetupCDTest { } @Test - public void deploymentScreenDCAEAssetUpdateWithNewGroupWithoutMembersCSAR_TC1368280_Test() throws Exception{ + public void deploymentScreenDCAEAssetUpdateWithNewGroupWithoutMembersCSAR_TC1368280_Test() throws Exception{ + String baseFileName = "baseUpdateMinusGroupFlowVF.csar"; String updateFileName = "baseUpdateAddGroupNoMembersUpdateFlow.csar"; String updateFileName2 = "baseUpdateFlowVF.csar"; @@ -175,6 +177,10 @@ public class DeploymentViewTests extends SetupCDTest { SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating VF with new file, should be %s groups now, base_ldsa group with members", 3)); ResourceUIUtils.updateVfWithCsar(filePath, updateFileName2); + if(true){ + throw new SkipException("Open bug 305812"); + } + // validate that member was added to base_ldsa group DeploymentViewVerificator.regularDepoymentScreenVerificator(metaDataFromUI, new DeploymentViewVerificator(filePath + updateFileName2)); DeploymentViewVerificator.validateModuleNameUpadate(); @@ -207,6 +213,10 @@ public class DeploymentViewTests extends SetupCDTest { // remove artifact from every group SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating VF with new file, should be 3 artifacts in every group")); ResourceUIUtils.updateVfWithCsar(filePath, updateFileName); + + if(true){ + throw new SkipException("Open bug 306329"); + } DeploymentViewVerificator.regularDepoymentScreenVerificator(metaDataFromUI, new DeploymentViewVerificator(filePath + updateFileName)); DeploymentViewVerificator.validateModuleNameUpadate(); @@ -227,6 +237,10 @@ public class DeploymentViewTests extends SetupCDTest { // add artifact to every group SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating VF with new file, should be 4 artifacts in every group")); ResourceUIUtils.updateVfWithCsar(filePath, baseFileName); + + if(true){ + throw new SkipException("Open bug 306005"); + } DeploymentViewVerificator.regularDepoymentScreenVerificator(metaDataFromUI, new DeploymentViewVerificator(filePath + baseFileName)); DeploymentViewVerificator.validateModuleNameUpadate(); @@ -248,6 +262,10 @@ public class DeploymentViewTests extends SetupCDTest { SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating VF with new file, mixing between artifacts and groups", 3)); ResourceUIUtils.updateVfWithCsar(filePath, updateFileName); + if(true){ + throw new SkipException("Open bug 306005"); + } + DeploymentViewVerificator.regularDepoymentScreenVerificator(metaDataFromUI, new DeploymentViewVerificator()); DeploymentViewVerificator.validateModuleNameUpadate(); }; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfArtifacts.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfArtifacts.java index 2957379ff8..cf8bfa5e5e 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfArtifacts.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/VfArtifacts.java @@ -54,6 +54,7 @@ import org.openecomp.sdc.ci.tests.utilities.OnboardingUtils; import org.openecomp.sdc.ci.tests.utils.Utils; import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils; import org.openqa.selenium.WebElement; +import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -90,11 +91,11 @@ public class VfArtifacts extends SetupCDTest{ public Object[][] provideData() { return new Object[][] { - { "2016-043_vsaegw_fdnt_30_1607_e2e.zip", "FDNT_UpdateHeatParams.zip", "2", "1" }, // expected heat version 2 and heatEnv 1 - { "2016-043_vsaegw_fdnt_30_1607_e2e.zip", "FDNT_WithoutEnvFiles.zip", "1", "1" }, // expected heat version 1 and heatEnv 1 - { "2016-014_vlandslide_ldsa_30_1607_e2e.zip", "2016-209_vjsa_vjsa_30_1610_e2e.zip", "1", "0" }, // expected heat version 1 and heatEnv 0 - { "2016-045_vlb_lmsp_30_1607_e2e.zip", "2016-045_vlb_lmsp_30_1607_e2e.zip", "1", "1" }, // expected heat version 1 and heatEnv 1(DE270634) - { "2016-109_mobt_mobt_30_1607_e2e.zip", "2016-109_mobt_mobt_30_1607_e2e_DifferentParams.zip", "2", "1" } // expected heat version 2 and heatEnv 1 + { "2016-043_vsaegw_fdnt_30_1607_e2e.zip", "FDNT_UpdateHeatParams.zip", "2", "2" }, // expected heat version 2 and heatEnv 2 + { "2016-043_vsaegw_fdnt_30_1607_e2e.zip", "FDNT_WithoutEnvFiles.zip", "1", "2" }, // expected heat version 1 and heatEnv 2 + { "2016-014_vlandslide_ldsa_30_1607_e2e.zip", "2016-209_vjsa_vjsa_30_1610_e2e.zip", "1", "1" }, // expected heat version 1 and heatEnv 1 + { "2016-045_vlb_lmsp_30_1607_e2e.zip", "2016-045_vlb_lmsp_30_1607_e2e.zip", "1", "2" }, // expected heat version 1 and heatEnv 2(DE270634) + { "2016-109_mobt_mobt_30_1607_e2e.zip", "2016-109_mobt_mobt_30_1607_e2e_DifferentParams.zip", "2", "2" } // expected heat version 2 and heatEnv 2 }; } @@ -306,7 +307,10 @@ public class VfArtifacts extends SetupCDTest{ for(Entry<String, File> envFileEntry : generatedEnvFileList.entrySet()){ GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ArtifactPageEnum.DOWNLOAD_ARTIFACT_ENV.getValue()+envFileEntry.getKey()); ArtifactUIUtils.compareYamlFilesByPattern(envFileEntry.getValue(), FileHandling.getLastModifiedFileFromDir(), PARAMETERS); - ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "0", ArtifactTypeEnum.HEAT_ENV); + if(true){ + throw new SkipException("Test skipped, new artifact version design should be developed"); + } + ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "1", ArtifactTypeEnum.HEAT_ENV); ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "1", ArtifactTypeEnum.HEAT); } } @@ -328,12 +332,15 @@ public class VfArtifacts extends SetupCDTest{ // TODO test will pass on case all objects on deployment view are visible GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ArtifactPageEnum.DOWNLOAD_ARTIFACT_ENV.getValue()+envFileEntry.getKey()); ArtifactUIUtils.compareYamlFilesByPattern(envFileEntry.getValue(), FileHandling.getLastModifiedFileFromDir(), PARAMETERS); + if(true){ + throw new SkipException("Test skipped, new artifact version design should be developed"); + } ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), expectedHeatEnvVersion, ArtifactTypeEnum.HEAT_ENV); ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), expectedHeatVersion, ArtifactTypeEnum.HEAT); } } -// expected heat version 1 and heatEnv 2 +// expected heat version 1 and heatEnv 3 @Test public void checkDefaultCreatedEnvArtifactsVspUpdatedWithSameVspTwice() throws Throwable{ String vnfFile = "2016-044_vfw_fcgi_30_1607_e2e.zip"; @@ -351,7 +358,10 @@ public class VfArtifacts extends SetupCDTest{ for(Entry<String, File> envFileEntry : generatedUpdatedSecondTimeEnvFileList.entrySet()){ GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ArtifactPageEnum.DOWNLOAD_ARTIFACT_ENV.getValue()+envFileEntry.getKey()); ArtifactUIUtils.compareYamlFilesByPattern(envFileEntry.getValue(), FileHandling.getLastModifiedFileFromDir(), PARAMETERS); - ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "2", ArtifactTypeEnum.HEAT_ENV); + if(true){ + throw new SkipException("Test skipped, new artifact version design should be developed"); + } + ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "3", ArtifactTypeEnum.HEAT_ENV); ArtifactUIUtils.validateArtifactVersionByTypeAndLabel(envFileEntry.getKey(), "1", ArtifactTypeEnum.HEAT); } } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java index 1838d3969d..820c6997f5 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java @@ -21,6 +21,7 @@ package org.openecomp.sdc.ci.tests.execute.setup; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.util.Arrays; import java.util.Map; @@ -30,6 +31,7 @@ import java.util.logging.Handler; import java.util.logging.LogManager; import java.util.logging.Logger; +import org.json.simple.JSONObject; import org.littleshoot.proxy.impl.ClientToProxyConnection; import org.littleshoot.proxy.impl.ProxyToServerConnection; import org.openecomp.sdc.be.model.User; @@ -43,6 +45,7 @@ import org.openecomp.sdc.ci.tests.run.StartTest; import org.openecomp.sdc.ci.tests.utilities.FileHandling; import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openecomp.sdc.ci.tests.utilities.RestCDUtils; +import org.openecomp.sdc.ci.tests.utils.rest.AutomationUtils; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -59,6 +62,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.ExtentTest; import com.aventstack.extentreports.Status; @@ -233,16 +237,48 @@ public abstract class SetupCDTest extends DriverFactory { getCsvReport().writeRow(result.getInstanceName(), name.replace(RE_RUN,""), status); } } + + public void generateReport4Jenkins(ITestResult result, ITestContext context) { + String suiteName = ExtentManager.getSuiteName(context); +// String outputDirectory = context.getOutputDirectory(); + JSONObject obj = new JSONObject(); + String success = Integer.toString(context.getPassedTests().size()); + String failed = Integer.toString(context.getFailedTests().size()); + String total = Integer.toString(context.getFailedTests().size()+context.getPassedTests().size()); + obj.put("projectName", "SDC-ONAP-UI-Automation-"+suiteName); + obj.put("projectVersion", AutomationUtils.getOSVersion()); + obj.put("platform", "Linux"); + obj.put("total", total); + obj.put("success", success); + obj.put("failed", failed); + + try (FileWriter file = new FileWriter(getReportFolder() + "jenkinsResults.json")) { + + file.write(obj.toJSONString()); + file.flush(); + + } catch (IOException e) { + e.printStackTrace(); + } + + System.out.print(obj); + + + } + + @AfterSuite(alwaysRun = true) - public void afterSuite() throws Exception { + public void afterSuite(ITestResult result, ITestContext context) throws Exception { if (getConfig().getUseBrowserMobProxy()){ MobProxy.getPoxyServer().stop(); } csvReport.closeFile(); + generateReport4Jenkins(result, context); RestCDUtils.deleteOnDemand(); + } protected static String setUrl() { @@ -262,7 +298,9 @@ public abstract class SetupCDTest extends DriverFactory { return; } File credentialsFileRemote = new File(FileHandling.getBasePath() + File.separator + "conf" + File.separator + CREDENTIALS_FILE); - File credentialsFileLocal = new File(FileHandling.getConfFilesPath() + CREDENTIALS_FILE); +// File credentialsFileLocal = new File(FileHandling.getConfFilesPath() + CREDENTIALS_FILE); + File credentialsFileLocal = new File(FileHandling.getSdcVncPath() + File.separator + "conf" + + File.separator + CREDENTIALS_FILE); File[] credentialFiles = {credentialsFileRemote, credentialsFileLocal}; for (File credentialsFile : credentialFiles){ if (credentialsFile.exists()){ diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/ArtifactUIUtils.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/ArtifactUIUtils.java index d55ace4374..c06a51ce91 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/ArtifactUIUtils.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/ArtifactUIUtils.java @@ -352,18 +352,18 @@ public final class ArtifactUIUtils { public static void validateArtifactNameVersionType(String artifactLabel, String artifactVersion, String artifactType) { // Assert.assertEquals(GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.ARTIFACT_NAME.getValue() + artifactLabel + "']")).getAttribute("textContent").trim(), artifactLabel); if(!GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.ARTIFACT_NAME.getValue() + artifactLabel + "']")).getAttribute("textContent").trim().equals(artifactLabel)) { - SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact label not equal - this warnning represent defect."); + SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact label not equal - this warning represent defect."); } if(artifactVersion != null) { // Assert.assertEquals(GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.VERSION.getValue() + artifactLabel + "']")).getAttribute("textContent").trim(), artifactVersion, "Artifact version not equal."); if(!GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.VERSION.getValue() + artifactLabel + "']")).getAttribute("textContent").trim().equals(artifactVersion)) { - SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact version not equal - this warnning represent defect."); + SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact version not equal - this warning represent defect."); } } if(artifactType != null) { // Assert.assertEquals(GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.TYPE.getValue() + artifactLabel + "']")).getAttribute("textContent").trim(), artifactType, "Artifact type not equal."); if(!GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + DataTestIdEnum.ArtifactPageEnum.TYPE.getValue() + artifactLabel + "']")).getAttribute("textContent").trim().equals(artifactType)) { - SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact type not equal - this warnning represent defect."); + SetupCDTest.getExtendTest().log(Status.WARNING, "Artifact type not equal - this warning represent defect."); } } } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java index 6008f200d2..a83e26d980 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java @@ -31,6 +31,7 @@ import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -108,13 +109,22 @@ public class FileHandling { return System.getProperty("user.dir") + File.separator; } + public static String getSdcVncPath() { + return Paths.get(System.getProperty("user.dir"), "..", "..", "sdc-vnfs").toString(); + } + + + public static String getDriversPath() { return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "ci" + File.separator + "drivers" + File.separator; } public static String getResourcesFilesPath() { - return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" +// return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" +// + File.separator + "Files" + File.separator; + + return getSdcVncPath()+ File.separator + "ui-tests" + File.separator + "Files" + File.separator; } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java index 95fbefa040..621cc26a12 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java @@ -767,24 +767,16 @@ public class OnboardingUtils { LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts = ((LinkedList<HeatMetaFirstLevelDefinition>) combinedMap.get("Deployment")); ArtifactsCorrelationManager.addVNFartifactDetails(vspName, deploymentArtifacts); - List<String> heatEnvFilesFromCSAR = deploymentArtifacts.stream().filter(e -> e.getType().equals("HEAT_ENV")). - map(e -> e.getFileName()). - collect(Collectors.toList()); - - validateDeploymentArtifactsVersion(deploymentArtifacts, heatEnvFilesFromCSAR); - + validateDeploymentArtifactsVersion(deploymentArtifacts); DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, vnfFile); return createVendorSoftwareProduct; } - public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts, - List<String> heatEnvFilesFromCSAR) { - String artifactVersion; + public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts) { + String artifactVersion = "1"; String artifactName; for(HeatMetaFirstLevelDefinition deploymentArtifact: deploymentArtifacts) { - artifactVersion = "1"; - if(deploymentArtifact.getType().equals("HEAT_ENV")) { continue; } else if(deploymentArtifact.getFileName().contains(".")) { @@ -792,10 +784,6 @@ public class OnboardingUtils { } else { artifactName = deploymentArtifact.getFileName().trim(); } - - if (heatEnvFilesFromCSAR.contains(artifactName + ".env")){ - artifactVersion = "2"; - } ArtifactUIUtils.validateArtifactNameVersionType(artifactName, artifactVersion, deploymentArtifact.getType()); } } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java index 2c133e6246..e4c4840450 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ServiceVerificator.java @@ -270,11 +270,6 @@ public class ServiceVerificator { } else if (propertyName.equals("max_vf_module_instances")) { actualNumber = baseNumber + 1; } else if (propertyName.equals("min_vf_module_instances")){ - - if(true){ - throw new SkipException("Open bug 305331"); - } - actualNumber = baseNumber - 1; } diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml b/ui-ci/src/main/resources/ci/conf/credentials.yaml deleted file mode 100644 index 481b12b1e0..0000000000 --- a/ui-ci/src/main/resources/ci/conf/credentials.yaml +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: m08740, - password: 272v!suAL37, - firstname: ASDC, - lastname: VITI - } - admin: { - username: m08741, - password: 863B@rroN27, - firstname: ASDC, - lastname: VITI - } - ops: { - username: m08742, - password: 364K!NDRed63, - firstname: ASDC, - lastname: VITI - } - tester: { - username: m08743, - password: 373m@rBLE28, - firstname: ASDC, - lastname: VITI - } - governor: { - username: m08744, - password: 742M!DDLE44, - firstname: ASDC, - lastname: VITI - } - product_strategist1: { - username: m08745, - password: 824S@Nder35, - firstname: ASDC, - lastname: VITI - } - product_manager1: { - username: m08746, - password: 747ICK!Y99, - firstname: ASDC, - lastname: VITI - } - product_local: { - username: m08747, - password: 623z!Ggy75, - firstname: ASDC, - lastname: VITI - }
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod b/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod deleted file mode 100644 index 481b12b1e0..0000000000 --- a/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: m08740, - password: 272v!suAL37, - firstname: ASDC, - lastname: VITI - } - admin: { - username: m08741, - password: 863B@rroN27, - firstname: ASDC, - lastname: VITI - } - ops: { - username: m08742, - password: 364K!NDRed63, - firstname: ASDC, - lastname: VITI - } - tester: { - username: m08743, - password: 373m@rBLE28, - firstname: ASDC, - lastname: VITI - } - governor: { - username: m08744, - password: 742M!DDLE44, - firstname: ASDC, - lastname: VITI - } - product_strategist1: { - username: m08745, - password: 824S@Nder35, - firstname: ASDC, - lastname: VITI - } - product_manager1: { - username: m08746, - password: 747ICK!Y99, - firstname: ASDC, - lastname: VITI - } - product_local: { - username: m08747, - password: 623z!Ggy75, - firstname: ASDC, - lastname: VITI - }
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest b/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest deleted file mode 100644 index ab37f7bee8..0000000000 --- a/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest +++ /dev/null @@ -1,48 +0,0 @@ - designer: { - username: cs0008, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - admin: { - username: jh0003, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - ops: { - username: af0006, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - tester: { - username: kb0004, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - governor: { - username: ah0002, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - } - product_strategist: { - username: m99126, - password: 1910-FruitGum, - firstname: ASDC, - lastname: KASPIN - } - product_manager: { - username: m99127, - password: 747-Airplane, - firstname: ASDC, - lastname: KASPIN - } - product_local: { - username: pm0001, - password: 123123a, - firstname: ASDC, - lastname: KASPIN - }
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh index 737b538b01..c85b6f4cf0 100644 --- a/ui-ci/src/main/resources/ci/scripts/startTest.sh +++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh @@ -89,7 +89,7 @@ TARGET_LOG_DIR="${TARGET_DIR}/" BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'` ADD_USERS_SCRIPT="addUsersFromList_new.sh" -USER_LIST="userList.txt" +USER_LIST="/conf/userList.txt" chmod +x ${ADD_USERS_SCRIPT} echo "add users..." `./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}` diff --git a/ui-ci/src/main/resources/ci/scripts/userList.txt b/ui-ci/src/main/resources/ci/scripts/userList.txt deleted file mode 100644 index 1a2026f291..0000000000 --- a/ui-ci/src/main/resources/ci/scripts/userList.txt +++ /dev/null @@ -1 +0,0 @@ -export USER_LIST=( "m99121 DESIGNER Carlos Santana carlos@email.com" "cs0008 DESIGNER Carlos Santana carlos@email.com" "kb0004 TESTER Carlos Santana carlos@email.com" "af0006 OPS Carlos Santana carlos@email.com" "ah0002 GOVERNOR Carlos Santana carlos@email.com" "m08740 DESIGNER Carlos Santana carlos@email.com" "m99124 TESTER Carlos Santana carlos@email.com" "m08743 TESTER Carlos Santana carlos@email.com" "m99123 OPS Carlos Santana carlos@email.com" "m08742 OPS" "m99125 GOVERNOR Carlos Santana carlos@email.com" "m08744 GOVERNOR Carlos Santana carlos@email.com" "m99122 ADMIN Carlos Santana carlos@email.com" "m08741 ADMIN Carlos Santana carlos@email.com" "m99126 PRODUCT_STRATEGIST Carlos Santana carlos@email.com" "m08745 PRODUCT_STRATEGISTCarlos Santana carlos@email.com" "m99127 PRODUCT_MANAGER Carlos Santana carlos@email.com" "m08746 PRODUCT_MANAGER Carlos Santana carlos@email.com" "md9897 DESIGNER Carlos Santana carlos@email.com" "m08748 DESIGNER Carlos Santana carlos@email.com" "m08749 TESTER Carlos Santana carlos@email.com" "be0695 DESIGNER Carlos Santana carlos@email.com" "er434w DESIGNER Carlos Santana carlos@email.com" "ya107f DESIGNER Carlos Santana carlos@email.com" "ds200p DESIGNER Carlos Santana carlos@email.com" "ak0333 ADMIN Carlos Santana carlos@email.com" "th0695 DESIGNER Carlos Santana carlos@email.com" "al714h DESIGNER Carlos Santana carlos@email.com" "ys9693 DESIGNER Carlos Santana carlos@email.com" "ss8214 DESIGNER Carlos Santana carlos@email.com" "bt750h DESIGNER Carlos Santana carlos@email.com" "rp955r DESIGNER Carlos Santana carlos@email.com" "ez6451 DESIGNER Carlos Santana carlos@email.com" "ia901h DESIGNER Carlos Santana carlos@email.com" "ah7840 DESIGNER Carlos Santana carlos@email.com" "ea394r DESIGNER Carlos Santana carlos@email.com" "ms656r DESIGNER Carlos Santana carlos@email.com" "ml636r DESIGNER Carlos Santana carlos@email.com" "it1721 DESIGNER Carlos Santana carlos@email.com" "sg473v DESIGNER Carlos Santana carlos@email.com" "sa997j DESIGNER Carlos Santana carlos@email.com" "az2497 DESIGNER Carlos Santana carlos@email.com" "ys189e DESIGNER Carlos Santana carlos@email.com" "ig642y DESIGNER Carlos Santana carlos@email.com")
\ No newline at end of file |