summaryrefslogtreecommitdiffstats
path: root/test-apis-ci/src/main/java/org
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-17 22:40:44 +0300
committerMichael Lando <ml636r@att.com>2017-06-18 07:20:49 +0300
commit4d97d5fac309ce0d66938e5ccd0349e2660d4e23 (patch)
tree3f921054f997d1962fa6f9db9a0119e31a851eea /test-apis-ci/src/main/java/org
parent89786d31f266a205857cae0177904c249ac6a512 (diff)
[sdc] update code of sdc
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'test-apis-ci/src/main/java/org')
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java7
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java58
2 files changed, 34 insertions, 31 deletions
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
index fb04f6a68b..d59b3f44f2 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
@@ -22,8 +22,11 @@ package org.openecomp.sdc.ci.tests.datatypes.enums;
public enum UserRoleEnum {
- ADMIN("jh0003", "Jimmy", "Hendrix"), DESIGNER("cs0008", "Carlos", "Santana"), DESIGNER2("me0009", "Melissa","Etheridge"), TESTER("jm0007", "Joni", "Mitchell"), ADMIN4("km2000", "Kot", "May"),
- GOVERNOR("gv0001","David", "Shadmi"), OPS("op0001", "Steve", "Regev"), PRODUCT_STRATEGIST1("ps0001", "Eden","Rozin"), PRODUCT_STRATEGIST2("ps0002", "Ella", "Kvetny"), PRODUCT_STRATEGIST3("ps0003", "Geva", "Alon"),
+// ADMIN("jh0003", "Jimmy", "Hendrix"), DESIGNER("cs0008", "Carlos", "Santana"), DESIGNER2("me0009", "Melissa","Etheridge"), TESTER("jm0007", "Joni", "Mitchell"), ADMIN4("km2000", "Kot", "May"),
+// GOVERNOR("gv0001","David", "Shadmi"), OPS("op0001", "Steve", "Regev"), PRODUCT_STRATEGIST1("ps0001", "Eden","Rozin"), PRODUCT_STRATEGIST2("ps0002", "Ella", "Kvetny"), PRODUCT_STRATEGIST3("ps0003", "Geva", "Alon"),
+// PRODUCT_MANAGER1("pm0001", "Teddy", "Isashar"), PRODUCT_MANAGER2("pm0002", "Sarah", "Bettens");
+ ADMIN("jh0003", "Jimmy", "Hendrix"), DESIGNER("cs0008", "Carlos", "Santana"), DESIGNER2("me0009", "Melissa","Etheridge"), TESTER("jm0007", "Johnny", "Depp"), ADMIN4("km2000", "Kot", "May"),
+ GOVERNOR("gv0001","David", "Shadmi"), OPS("op0001", "Aretha", "Franklin"), PRODUCT_STRATEGIST1("ps0001", "Eden","Rozin"), PRODUCT_STRATEGIST2("ps0002", "Ella", "Kvetny"), PRODUCT_STRATEGIST3("ps0003", "Geva", "Alon"),
PRODUCT_MANAGER1("pm0001", "Teddy", "Isashar"), PRODUCT_MANAGER2("pm0002", "Sarah", "Bettens");
private String userId;
private String firstName;
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java b/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
index c3f9a723c2..0ba357e890 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
@@ -129,7 +129,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
super(name, CRUDExternalAPI.class.getName());
}
- @DataProvider(name="uploadArtifactOnVfcVlCpViaExternalAPI" , parallel=true)
+ @DataProvider(name="uploadArtifactOnVfcVlCpViaExternalAPI" , parallel=false)
public static Object[][] dataProviderUploadArtifactOnVfcVlCpViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML", ResourceTypeEnum.VFC},
@@ -232,7 +232,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
uploadArtifactOnAssetViaExternalAPI(ComponentTypeEnum.RESOURCE, chosenLifeCycleState, artifactType, resourceTypeEnum);
}
- @DataProvider(name="uploadArtifactOnVFViaExternalAPI", parallel=true)
+ @DataProvider(name="uploadArtifactOnVFViaExternalAPI", parallel=false)
public static Object[][] dataProviderUploadArtifactOnVFViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_JSON"},
@@ -288,7 +288,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="uploadArtifactOnServiceViaExternalAPI" , parallel=true)
+ @DataProvider(name="uploadArtifactOnServiceViaExternalAPI" , parallel=false)
public static Object[][] dataProviderUploadArtifactOnServiceViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML"},
@@ -317,7 +317,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="uploadArtifactOnServiceViaExternalAPIIncludingDistribution", parallel=true)
+ @DataProvider(name="uploadArtifactOnServiceViaExternalAPIIncludingDistribution", parallel=false)
public static Object[][] dataProviderUploadArtifactOnServiceViaExternalAPIIncludingDistribution() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML"},
@@ -587,7 +587,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="uploadArtifactOnRIViaExternalAPI", parallel=true)
+ @DataProvider(name="uploadArtifactOnRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderUploadArtifactOnRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA"},
@@ -633,7 +633,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="uploadArtifactOnVfcVlCpRIViaExternalAPI", parallel=true)
+ @DataProvider(name="uploadArtifactOnVfcVlCpRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderUploadArtifactOnVfcVlCpRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA", ResourceTypeEnum.VFC},
@@ -735,7 +735,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel=true)
+ @DataProvider(name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel=false)
public static Object[][] dataProviderUploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI() {
return new Object[][] {
@@ -1140,7 +1140,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=true)
+ @DataProvider(name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=false)
public static Object[][] dataProviderUploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset() {
return new Object[][] {
{ComponentTypeEnum.RESOURCE, UserRoleEnum.DESIGNER2, LifeCycleStatesEnum.CHECKOUT},
@@ -1223,7 +1223,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="uploadArtifactOnAssetWhichNotExist", parallel=true)
+ @DataProvider(name="uploadArtifactOnAssetWhichNotExist", parallel=false)
public static Object[][] dataProviderUploadArtifactOnAssetWhichNotExist() {
return new Object[][] {
{ComponentTypeEnum.SERVICE},
@@ -1273,7 +1273,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="uploadArtifactOnAssetWhichInInvalidStateForUploading", parallel=true)
+ @DataProvider(name="uploadArtifactOnAssetWhichInInvalidStateForUploading", parallel=false)
public static Object[][] dataProviderUploadArtifactOnAssetWhichInInvalidStateForUploading() {
return new Object[][] {
{ComponentTypeEnum.SERVICE},
@@ -1318,7 +1318,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
- @DataProvider(name="updateArtifactForServiceViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactForServiceViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactForServiceViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML"},
@@ -1361,7 +1361,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
}
- @DataProvider(name="updateArtifactForVFViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactForVFViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactForVFViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_JSON"},
@@ -1423,7 +1423,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
}
- @DataProvider(name="updateArtifactForVfcVlCpViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactForVfcVlCpViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactForVfcVlCpViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML", ResourceTypeEnum.VFC},
@@ -1533,7 +1533,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
}
- @DataProvider(name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI() {
return new Object[][] {
{ResourceTypeEnum.VFC},
@@ -1575,7 +1575,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="updateArtifactOnRIViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactOnRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactOnRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA", null},
@@ -1625,7 +1625,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="updateArtifactOnVfcVlCpRIViaExternalAPI", parallel=true)
+ @DataProvider(name="updateArtifactOnVfcVlCpRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateArtifactOnVfcVlCpRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA", ResourceTypeEnum.VFC},
@@ -1741,7 +1741,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=true)
+ @DataProvider(name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=false)
public static Object[][] dataProviderUpdateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset() {
return new Object[][] {
{ComponentTypeEnum.RESOURCE, UserRoleEnum.DESIGNER2, LifeCycleStatesEnum.CHECKOUT, "OTHER"},
@@ -1803,7 +1803,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="updateArtifactOnAssetWhichNotExist", parallel=true)
+ @DataProvider(name="updateArtifactOnAssetWhichNotExist", parallel=false)
public static Object[][] dataProviderUpdateArtifactOnAssetWhichNotExist() {
return new Object[][] {
{ComponentTypeEnum.SERVICE, "OTHER", null},
@@ -1866,7 +1866,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="updateArtifactOnAssetWhichInInvalidStateForUploading", parallel=true)
+ @DataProvider(name="updateArtifactOnAssetWhichInInvalidStateForUploading", parallel=false)
public static Object[][] dataProviderUpdateProviderDeleteArtifactOnAssetWhichInInvalidStateForUploading() {
return new Object[][] {
{ComponentTypeEnum.SERVICE, "OTHER"},
@@ -1891,7 +1891,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
- @DataProvider(name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel=true)
+ @DataProvider(name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI", parallel=false)
public static Object[][] dataProviderUpdateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, ComponentTypeEnum.RESOURCE, "updateArtifactWithInvalidCheckSum"},
@@ -2545,7 +2545,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
- @DataProvider(name="deleteArtifactForServiceViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactForServiceViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactForServiceViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML"},
@@ -2582,7 +2582,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.SERVICE, lifeCycleStatesEnum);
}
- @DataProvider(name="deleteArtifactForVFViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactForVFViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactForVFViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_JSON"},
@@ -2638,7 +2638,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum);
}
- @DataProvider(name="deleteArtifactForVfcVlCpViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactForVfcVlCpViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactForVfcVlCpViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "YANG_XML", ResourceTypeEnum.VFC},
@@ -2742,7 +2742,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
deleteArtifactOnAssetViaExternalAPI(component, ComponentTypeEnum.RESOURCE, lifeCycleStatesEnum);
}
- @DataProvider(name="deleteArtifactOnRIViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactOnRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactOnRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA", null},
@@ -2781,7 +2781,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="deleteArtifactOnVfcVlCpRIViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactOnVfcVlCpRIViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactOnVfcVlCpRIViaExternalAPI() {
return new Object[][] {
{LifeCycleStatesEnum.CHECKOUT, "DCAE_INVENTORY_TOSCA", ResourceTypeEnum.VFC},
@@ -2882,7 +2882,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=true)
+ @DataProvider(name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset", parallel=false)
public static Object[][] dataProviderDeleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset() {
return new Object[][] {
{ComponentTypeEnum.RESOURCE, UserRoleEnum.DESIGNER2, LifeCycleStatesEnum.CHECKOUT, "OTHER"},
@@ -2966,7 +2966,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="deleteArtifactOnAssetWhichNotExist", parallel=true)
+ @DataProvider(name="deleteArtifactOnAssetWhichNotExist", parallel=false)
public static Object[][] dataProviderDeleteArtifactOnAssetWhichNotExist() {
return new Object[][] {
{ComponentTypeEnum.SERVICE, "OTHER", null},
@@ -3032,7 +3032,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="deleteArtifactOnAssetWhichInInvalidStateForUploading", parallel=true)
+ @DataProvider(name="deleteArtifactOnAssetWhichInInvalidStateForUploading", parallel=false)
public static Object[][] dataProviderDeleteArtifactOnAssetWhichInInvalidStateForUploading() {
return new Object[][] {
{ComponentTypeEnum.SERVICE, "OTHER"},
@@ -3075,7 +3075,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
}
- @DataProvider(name="deleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel=true)
+ @DataProvider(name="deleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI", parallel=false)
public static Object[][] dataProviderDeleteArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI() {
return new Object[][] {
{ResourceTypeEnum.VFC},