summaryrefslogtreecommitdiffstats
path: root/asdc-tests/src/main/resources/ci
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-09 03:19:04 +0300
committerMichael Lando <ml636r@att.com>2017-06-09 03:19:04 +0300
commited64b5edff15e702493df21aa3230b81593e6133 (patch)
treea4cb01fdaccc34930a8db403a3097c0d1e40914b /asdc-tests/src/main/resources/ci
parent280f8015d06af1f41a3ef12e8300801c7a5e0d54 (diff)
[SDC-29] catalog 1707 rebase commit.
Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'asdc-tests/src/main/resources/ci')
-rw-r--r--asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml (renamed from asdc-tests/src/main/resources/ci/conf/sdc-packages.yaml)0
-rw-r--r--asdc-tests/src/main/resources/ci/conf/attsdc.yaml (renamed from asdc-tests/src/main/resources/ci/conf/sdc.yaml)11
-rw-r--r--asdc-tests/src/main/resources/ci/conf/titan.properties2
-rw-r--r--asdc-tests/src/main/resources/ci/scripts/startTest.sh2
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml40
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml23
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/ciFull.xml2
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/externalApis.xml3
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/resource.xml24
-rw-r--r--asdc-tests/src/main/resources/ci/testSuites/sanity.xml14
10 files changed, 101 insertions, 20 deletions
diff --git a/asdc-tests/src/main/resources/ci/conf/sdc-packages.yaml b/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml
index 5d1a3e1537..5d1a3e1537 100644
--- a/asdc-tests/src/main/resources/ci/conf/sdc-packages.yaml
+++ b/asdc-tests/src/main/resources/ci/conf/attsdc-packages.yaml
diff --git a/asdc-tests/src/main/resources/ci/conf/sdc.yaml b/asdc-tests/src/main/resources/ci/conf/attsdc.yaml
index c9730811b3..10bf38f89d 100644
--- a/asdc-tests/src/main/resources/ci/conf/sdc.yaml
+++ b/asdc-tests/src/main/resources/ci/conf/attsdc.yaml
@@ -7,6 +7,7 @@ disributionClientHost: disClient
catalogFePort: 8181
catalogBePort: 8080
disributionClientPort: 8181
+isDistributionClientRunning: true
esPort: 9200
neoHost: neoHost
neoPort: 7474
@@ -30,8 +31,8 @@ cassandraPassword: bobo
cassandraSsl: false
cassandraTruststorePath : /path/path
cassandraTruststorePassword : 123123
-cassandraAuditKeySpace: sdcAudit
-cassandraArtifactKeySpace: sdcArtifact
+cassandraAuditKeySpace: sdcaudit
+cassandraArtifactKeySpace: sdcartifact
stopOnClassFailure: false
@@ -78,11 +79,13 @@ resourceCategoriesNotToDelete:
- Network L4+
- Application L4+
- Network Connectivity
- - DcaeComponent
+ - DCAE Component
+ - Template
+ - Allotted Resource
#Service categories to keep
serviceCategoriesNotToDelete:
- Mobility
- Network L1-3
- Network L4+
- - VoIP Call Control \ No newline at end of file
+ - VoIP Call Control
diff --git a/asdc-tests/src/main/resources/ci/conf/titan.properties b/asdc-tests/src/main/resources/ci/conf/titan.properties
index 42e1998f89..0fe7888b9e 100644
--- a/asdc-tests/src/main/resources/ci/conf/titan.properties
+++ b/asdc-tests/src/main/resources/ci/conf/titan.properties
@@ -4,5 +4,5 @@ storage.hostname=localhost
storage.port=9160
cache.db-cache = false
-
+storage.cassandra.keyspace=sdctitan
diff --git a/asdc-tests/src/main/resources/ci/scripts/startTest.sh b/asdc-tests/src/main/resources/ci/scripts/startTest.sh
index ca3add59c5..01b8979781 100644
--- a/asdc-tests/src/main/resources/ci/scripts/startTest.sh
+++ b/asdc-tests/src/main/resources/ci/scripts/startTest.sh
@@ -31,7 +31,7 @@ fi
LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties
#############################################
TARGET_DIR=${FULL_PATH}/target
-CONF_FILE=${FULL_PATH}/conf/sdc.yaml
+CONF_FILE=${FULL_PATH}/conf/attsdc.yaml
DEBUG=true
MainClass=org.openecomp.sdc.ci.tests.run.StartTest
diff --git a/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml
new file mode 100644
index 0000000000..e53da8da8a
--- /dev/null
+++ b/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2" parallel="tests" thread-count="10">
+
+ <test name="Test">
+ <classes>
+ <class
+ name="org.openecomp.sdc.ci.tests.execute.devCI.CRUDExternalAPI">
+ <methods>
+ <include name="uploadArtifactOnVFViaExternalAPI" />
+ <include name="uploadArtifactOnServiceViaExternalAPI" />
+ <include name="uploadArtifactOnRIViaExternalAPI" />
+ <include name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+ <include name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+ <include name="uploadArtifactOnAssetWhichNotExist" />
+ <include name="uploadArtifactOnAssetWhichInInvalidStateForUploading" />
+
+
+ <include name="updateArtifactForServiceViaExternalAPI" />
+ <include name="updateArtifactForVFViaExternalAPI" />
+ <include name="updateArtifactOnRIViaExternalAPI" />
+ <include name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+ <include name="updateArtifactOnAssetWhichNotExist" />
+ <include name="updateArtifactOnAssetWhichInInvalidStateForUploading" />
+ <include name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+
+
+ <include name="deleteArtifactForServiceViaExternalAPI" />
+ <include name="deleteArtifactForVFViaExternalAPI" />
+ <include name="deleteArtifactOnRIViaExternalAPI" />
+ <include name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+ <include name="deleteArtifactOnAssetWhichNotExist" />
+ <include name="deleteArtifactOnAssetWhichInInvalidStateForUploading" />
+ </methods>
+
+ </class>
+
+ </classes>
+ </test> <!-- Test -->
+</suite> <!-- Suite --> \ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml b/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml
new file mode 100644
index 0000000000..40c462a4cb
--- /dev/null
+++ b/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2" parallel="tests" thread-count="10">
+
+ <test name="Test">
+ <classes>
+ <class
+ name="org.openecomp.sdc.ci.tests.execute.devCI.SearchFilterCategoryExternalAPI">
+ <methods>
+
+ <include name="searchWithInvalidFilter" />
+ <include name="searchForResourceTypeNegativeTest" />
+ <include name="searchingForResouceFilterIncorrectResouceTypeUsingExternalAPI" />
+ <include name="searchingForSeveralResouceTypesUsingExternalAPI" />
+ <include name="searchingForSeveralResourcesOfTypeVFCMTUsingExternalAPI" />
+ <include name="normativeResourceCategory" />
+ </methods>
+
+ </class>
+
+ </classes>
+ </test> <!-- Test -->
+</suite> <!-- Suite --> \ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
index 9877670a90..26a85fd9c6 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
@@ -177,7 +177,7 @@
<exclude name="dissociateOnceAgainTest" />
<exclude name="dissociateRelationNotFoundTest" />
<exclude name="dissoicateRelationWhileInstanceNotFound" />
- <exclude name="dissoicateWithEmptyUserIdsHeaderTest" />
+ <exclude name="dissoicateWithEmptyUserIdHeaderTest" />
<exclude name="relationDeletedAfterDeletingResourceInstanceTest" />
</methods>
</class>
diff --git a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml b/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
index 5db368ecf4..393d3b1a3e 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
@@ -6,6 +6,9 @@
<class name="org.openecomp.sdc.externalApis.GetAssetServlet" />
<class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
<class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.devCI.CRUDExternalAPI"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.devCI.SearchFilterCategoryExternalAPI"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.externalapi.UserAPIs"/>
</classes>
</test>
</suite> \ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/resource.xml b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
index 5f23325790..803fb01e70 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/resource.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
@@ -30,6 +30,30 @@
</methods>
</class>
+ <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArt">
+ <methods>
+ <include name="UpdateAllResourceMandatoryArtifacts"/>
+ <include name="updateInformationalArtifactMetadataOfResource"/>
+ </methods>
+ </class>
+ <class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArtCloudQuestionnaire">
+ <methods>
+ <include name="updateMandatoryInformationalArtifact_CloudQuestionnaire"/>
+ </methods>
+ </class>
+ <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceApiArtifactTest">
+ <methods>
+ <include name="uploadServiceApiArtifactSuccessfullyTest"/>
+ <include name="updateApiArtifactSuccessfullyTest"/>
+ <include name="deleteApiArtifactSuccessfully"/>
+ </methods>
+ </class>
+ <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceInformationalArtifact">
+ <methods>
+ <include name="updateMandatoryInformationalArtifact_ServiceQuestionnaire"/>
+ </methods>
+ </class>
+
<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse"/>
<class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
diff --git a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
index 11b4b79fc4..8e787bc8cd 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
@@ -2,10 +2,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Sanity" configfailurepolicy="continue" verbose="2">
- <listeners>
- <listener class-name="org.openecomp.sdc.ci.tests.run.ExtentReporterNG" />
- </listeners>
-
<test name="sanityE2Eflows">
<classes>
<class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E" />
@@ -69,8 +65,6 @@
</methods>
</class>
-
-
<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse" />
@@ -268,15 +262,9 @@
name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
<methods>
<include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed" />
- <!--
- This test require the onboarding simulator.
- <include name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed" />
- -->
+ <include name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed" />
</methods>
</class>
- <class
- name="org.openecomp.sdc.ci.tests.execute.imports.CsarUtilsTest">
- </class>
</classes>
</test> <!-- Test -->