Add sdc startup in IT

Move the Api tests code in the integration-test module, and remove the need to have a container

Issue-ID: SDC-3232
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia2b5d94d958e975867c600597ab5e56dffcd06ab
Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>

30 files changed, 1076 insertions, 0 deletions

diff --git a/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml b/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml
new file mode 100644
index 0000000000..5d1a3e1537
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/attsdc-packages.yaml
@@ -0,0 +1,12 @@
+packages:
+ - org.openecomp.sdc.ci.tests.execute.general
+ - org.openecomp.sdc.ci.tests.execute.user
+ - org.openecomp.sdc.ci.tests.execute.property
+ - org.openecomp.sdc.ci.tests.execute.lifecycle
+ - org.openecomp.sdc.ci.tests.execute.resource
+ - org.openecomp.sdc.ci.tests.execute.service
+ - org.openecomp.sdc.ci.tests.execute.artifacts
+ - org.openecomp.sdc.ci.tests.execute.imports
+ - org.openecomp.sdc.ci.tests.execute.category
+ - org.openecomp.sdc.ci.tests.execute.distribution  
+ - org.openecomp.sdc.ci.tests.execute.product
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/attsdc.yaml b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
new file mode 100644
index 0000000000..29357b28b2
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
@@ -0,0 +1,97 @@
+outputFolder: target
+reportName: index.html
+catalogBeHost: 127.0.0.1
+catalogFeHost: 127.0.0.1
+onboardingBeHost: 127.0.0.1
+onboardingBePort: 8081
+esHost: eshost
+disributionClientHost: disClient
+catalogFePort: 8181
+catalogBePort: 8080
+disributionClientPort: 8181
+isDistributionClientRunning: true
+esPort: 9200
+neoHost: neoHost
+neoPort: 7474
+neoDBusername: neo4j	
+neoDBpassword: 123456
+windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home"
+systemUnderDebug: false
+resourceConfigDir: src/test/resources/CI/tests
+componentsConfigDir: src/test/resources/CI/components
+importResourceConfigDir: ../catalog-be/src/main/resources/import/tosca/capability-types
+importResourceTestsConfigDir: src/test/resources/CI/importResourceTests
+errorConfigurationFile: ../catalog-be/src/main/resources/config/error-configuration.yaml
+configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml
+importTypesConfigDir: src/test/resources/CI/importTypesTest
+
+
+janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties
+cassandraHost: 127.0.0.1
+cassandraAuthenticate: false
+cassandraUsername: koko
+cassandraPassword: bobo
+cassandraSsl: false
+cassandraTruststorePath : /path/path
+cassandraTruststorePassword : 123123
+cassandraAuditKeySpace: sdcaudit
+cassandraArtifactKeySpace: sdcartifact
+url: http://localhost:8285/sdc1
+
+sdcHttpMethod: http
+localDataCenter: DC-Automate01
+
+stopOnClassFailure: false
+
+#List of non-abstract resources to keep during janus graph cleanup between tests
+#Only 1.0 version will be kept
+resourcesNotToDelete:
+     - Compute
+     - Database
+     - ObjectStorage
+     - BlockStorage
+     - LoadBalancer
+     - Port
+     - Network
+     - Root
+     - ContainerApplication
+     - ContainerRuntime
+     - DBMS
+     - SoftwareComponent
+     - WebApplication
+     - WebServer
+     - CinderVolume
+     - ContrailVirtualNetwork
+     - NeutronNet
+     - NeutronPort
+     - NovaServer
+     - AbstractSubstitute
+     - ContrailAbstractSubstitute
+     - ContrailCompute
+     - ContrailNetworkRules
+     - ContrailPort
+     - ContrailV2NetworkRules
+     - ContrailV2VirtualMachineInterface
+     - ContrailV2VirtualNetwork
+     - ContrailVirtualNetwork
+     - VL ELINE
+     - SecurityRules
+     - VL
+
+#Resource categories to keep (including all their subcategories)
+resourceCategoriesNotToDelete:
+     - Generic
+     - Network L2-3
+     - Network L4+
+     - Application L4+
+     - Network Connectivity
+     - 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
diff --git a/integration-tests/src/test/resources/ci/conf/credentials.yaml b/integration-tests/src/test/resources/ci/conf/credentials.yaml
new file mode 100644
index 0000000000..05f9a71c5c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/credentials.yaml
@@ -0,0 +1,48 @@
+    designer: {
+        username: cs0008,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    admin: {
+        username: jh0003,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    ops: {
+        username: op0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    tester: {
+        username: jm0007,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    governor: {
+        username: gv0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_strategist: {
+        username: m99126,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_manager: {
+        username: m99127,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
+    product_local: {
+        username: pm0001,
+        password: 123123a,
+        firstname: SDC,
+        lastname: SDC2
+    }
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/extent-config.xml b/integration-tests/src/test/resources/ci/conf/extent-config.xml
new file mode 100644
index 0000000000..4eb7f681aa
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/extent-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extentreports>
+    <configuration>
+        <!-- report theme -->
+        <!-- standard, dark -->
+        <theme>standard</theme>
+    
+        <!-- document encoding -->
+        <!-- defaults to UTF-8 -->
+        <encoding>UTF-8</encoding>
+        
+        <!-- protocol for script and stylesheets -->
+        <!-- defaults to https -->
+        <protocol>https</protocol>
+        
+        <!-- title of the document -->
+        <documentTitle>ASDC Automation Report</documentTitle>
+        
+        <!-- report name - displayed at top-nav -->
+        <reportName> ASDC Automation Report </reportName>
+        
+        <!-- report headline - displayed at top-nav, after reportHeadline -->
+        <reportHeadline></reportHeadline>
+        
+        <!-- global date format override -->
+        <!-- defaults to yyyy-MM-dd -->
+        <dateFormat>yyyy-MM-dd</dateFormat>
+        
+        <!-- global time format override -->
+        <!-- defaults to HH:mm:ss -->
+        <timeFormat>HH:mm:ss</timeFormat>
+        
+        <!-- custom javascript -->
+        <scripts>
+            <![CDATA[
+                $(document).ready(function() {
+                    $('.logo-content' ).remove();
+                    $('.charts div:nth-child(2)').remove();  
+                });
+            ]]>
+        </scripts>
+        
+        <!-- custom styles -->
+        <styles>
+            <![CDATA[
+                .report-name {padding-top: 1px; font-size: 15px; font-weight: bold;}
+            ]]>
+        </styles>
+    </configuration>
+</extentreports>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/janusgraph.properties b/integration-tests/src/test/resources/ci/conf/janusgraph.properties
new file mode 100644
index 0000000000..6cf8068bcd
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/janusgraph.properties
@@ -0,0 +1,11 @@
+storage.backend=cql
+storage.hostname=127.0.0.1
+storage.port=9042
+
+cache.db-cache = false
+cache.db-cache-clean-wait = 20
+cache.db-cache-time = 180000
+cache.db-cache-size = 0.5
+
+cache.tx-cache-size = 500000
+storage.cql.keyspace=sdctitan
diff --git a/integration-tests/src/test/resources/ci/conf/log4j2.properties b/integration-tests/src/test/resources/ci/conf/log4j2.properties
new file mode 100644
index 0000000000..a8944dba13
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/log4j2.properties
@@ -0,0 +1,46 @@
+status = error
+dest = err
+name = PropertiesConfig
+
+property.filename = ${targetlog}logs/ci-log.out
+
+#filter.threshold.type = ThresholdFilter
+#filter.threshold.level = debug
+
+appender.rolling.type = RollingFile
+appender.rolling.name = RollingFile
+appender.rolling.fileName = ${filename}
+appender.rolling.filePattern = ${targetlog}logs/ci-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=5MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 10
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = info
+
+logger.rolling.name = RollingAppender
+logger.rolling.level = info
+logger.rolling.additivity = false
+logger.rolling.appenderRef.rolling.ref = RollingFile
+
+logger.org.apache.cassandra.service.StorageProxy.level=info
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.level =info
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.rolling.ref = RollingFile
+logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction.appendRef.stdout.ref = STDOUT
+
+logger.org.openecomp.sdc.ci.tests.utils.level = info
+logger.org.openecomp.sdc.ci.tests.utils.appendRef.rolling.ref = RollingFile
+logger.org.openecomp.sdc.ci.tests.utils.appendRef.stdout.ref = STDOUT
+logger.org.openecomp.sdc.ci.tests.utils.additivity = false
+
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.rolling.ref = RollingFile
diff --git a/integration-tests/src/test/resources/ci/conf/log4j2.xml b/integration-tests/src/test/resources/ci/conf/log4j2.xml
new file mode 100644
index 0000000000..5295d45a47
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ERROR">
+	<Appenders>
+		<File name="fileAppender" fileName="logfile.log" append="false">
+			<PatternLayout pattern="%d %-5p [%c{1}] %m %n"/>
+		</File>
+	</Appenders>
+	<Loggers>
+		<Root level="info">
+			<AppenderRef ref="fileAppender"/>
+		</Root>
+	</Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
new file mode 100644
index 0000000000..005bdba0f3
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="lifeCycle" parallel="none">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- lifeCycle -->
diff --git a/integration-tests/src/test/resources/ci/conf/truststore b/integration-tests/src/test/resources/ci/conf/truststore
new file mode 100644
index 0000000000..bdec93d862
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/conf/truststore
diff --git a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
new file mode 100644
index 0000000000..923777542c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
@@ -0,0 +1,42 @@
+<?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.externalApis.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" /> -->
+					
+					<include name="deleteArtifactForServiceViaExternalAPI" />
+				</methods>
+      
+      </class>
+      
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
new file mode 100644
index 0000000000..02594526cb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
@@ -0,0 +1,68 @@
+<?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="methods" thread-count="2" data-provider-thread-count="2">
+
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+   		<methods>
+			<include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="uploadArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForVFViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactForVfcVlCpViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="updateArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactForServiceViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactForVFViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" />
+			<include name="deleteArtifactOnAssetWhichNotExist" />			
+		</methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+            <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+        <methods>
+            <include name="normativeResourceCategory" invocation-numbers="0"/>
+        </methods>
+      </class>      
+      <class name="org.openecomp.sdc.externalApis.GetCSARofVF">
+        <methods>
+            <include name="getServiceToscaModelCheckInState"/>
+            <include name="getRsourceToscaModelCertifyState"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+        <methods>
+            <include name="getResourceAssetMetadataSuccess"/>
+            <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.AssetLifeCycle">
+        <methods>
+            <include name="theFlow"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml b/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
new file mode 100644
index 0000000000..8d21be4381
--- /dev/null
+++ b/integration-tests/src/test/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.externalApis.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/integration-tests/src/test/resources/ci/testSuites/artifacts.xml b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
new file mode 100644
index 0000000000..1352e75d58
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Artifacts">
+  <test name="Artifacts">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
new file mode 100644
index 0000000000..8298af2da5
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Cap_Req" >
+	<test name="Cap_Req">
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.requirements.RequirementsTest"/>
+			<class name="org.openecomp.sdc.ci.tests.capability.CapabilitiesTest"/>
+		</classes>
+	</test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/category.xml b/integration-tests/src/test/resources/ci/testSuites/category.xml
new file mode 100644
index 0000000000..3de83431e8
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/category.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="category">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- category -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
new file mode 100644
index 0000000000..7a9558ed7a
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="ciFull" configfailurepolicy="continue" verbose="2">
+  <test name="Category">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest">
+        <methods>
+          <exclude name="createProductGroupForNonExistingCategory"/>
+          <exclude name="createProductGroupForNonExistingSunCategory"/>
+          <exclude name="getProductCategoryHierarchySuccessFlow"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest">
+        <methods>
+          <exclude name="createProductSubCategoryForNonExistingCategory"/>
+          <exclude name="createResourceSubCategoryForNonExistingCategory"/>
+          <exclude name="getResourceCategoryHierarchySuccessFlow"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+  <test name="Distribution">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+  <test name="General">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test>
+  <test name="Resource">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <exclude name="UpdateResourceCategory_negativeFlow"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <exclude name="undoCheckOutNotExist"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <exclude name="checkInProductNotExist"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest">
+        <methods>
+          <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
+          <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
+          <exclude name="createProductDescriptionValidCharacters01"/>
+          <exclude name="createProductDescriptionValidCharacters02"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+  <test name="Service">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+    </classes>
+  </test>
+  <test name="Artifacts">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
new file mode 100644
index 0000000000..7c9d6d9d9c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="8">
+	<test name="ExternalApis"> 
+		<classes>	
+			
+			<class name="org.openecomp.sdc.externalApis.VFCMTExternalAPI"/>
+			<class name="org.openecomp.sdc.externalApis.CRUDExternalAPI"/> 
+			<class name="org.openecomp.sdc.externalApis.DeploymentValiditaion"/>  
+ 			<class name="org.openecomp.sdc.externalApis.GetAssetServlet"/>
+			<class name="org.openecomp.sdc.externalApis.GetCSARofVF"/>
+			<class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
+			<class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
+			<class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI"/>
+			<class name="org.openecomp.sdc.externalApis.AssetLifeCycle"/>
+			<class name="org.openecomp.sdc.externalApis.UserAPIs"/>
+
+			<class name="org.openecomp.sdc.internalApis.annotations.AnnotationsTest"/>
+
+			
+<!-- 	      <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>    -->
+			
+			
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/general.xml b/integration-tests/src/test/resources/ci/testSuites/general.xml
new file mode 100644
index 0000000000..a63f36423e
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/general.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="General">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- General -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/imports.xml b/integration-tests/src/test/resources/ci/testSuites/imports.xml
new file mode 100644
index 0000000000..b9374cf47a
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/imports.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Imports">
+  <test name="Imports">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Imports -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/normatives.xml b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
new file mode 100644
index 0000000000..02da714578
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="normatives" >
+	<test name="InterfaceLifecycleTypes">
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
new file mode 100644
index 0000000000..9fcd043cd3
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
+	<parameter name="makeDistribution"  value="false"/>
+	<parameter name="makeToscaValidation"  value="true"/>
+	<test name="ExternalApis"> 
+		<classes>
+			<class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/>
+		</classes>
+	</test>
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/pass.xml b/integration-tests/src/test/resources/ci/testSuites/pass.xml
new file mode 100644
index 0000000000..731d73675c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/pass.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1">
+    <parameter name="makeDistribution"  value="false"/>
+    <parameter name="makeToscaValidation"  value="true"/>
+    <test name="passTest">
+
+ <classes>
+    <class
+            name="org.openecomp.sdc.ci.tests.sanity.Onboard">
+        <methods>
+            <include name="passTest" />
+        </methods>
+    </class>
+
+    </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/product.xml b/integration-tests/src/test/resources/ci/testSuites/product.xml
new file mode 100644
index 0000000000..101b94a6bb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/product.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Product">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductLifecycleTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Product -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
new file mode 100644
index 0000000000..df9aa9f152
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="productAPIs" configfailurepolicy="continue" verbose="2" parallel="tests"
+  thread-count="6">
+
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/property.xml b/integration-tests/src/test/resources/ci/testSuites/property.xml
new file mode 100644
index 0000000000..b7dba95f16
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/property.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Property" >
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Property -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/resource.xml b/integration-tests/src/test/resources/ci/testSuites/resource.xml
new file mode 100644
index 0000000000..4fd0e43a02
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/resource.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Sanity" configfailurepolicy="continue">
+
+  <test verbose="2" name="Sanity">
+    <classes>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <include name="downloadResourceArtifactSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+        <methods>
+          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+        <methods>
+          <include name="authorizeDeActivatedUser"/>
+        </methods>
+      </class>
+
+      <!-- Product tests start-->
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+        <methods>
+          <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
+          <include name="addInterfaceOperationsOnResource"/>
+          <include name="getInterfaceOperationsFromResource"/>
+          <include name="updateInterfaceOperationsOnResource"/>
+          <include name="deleteInterfaceOperationsFromResource"/>
+          <include name="addInterfaceOperationsOfGlobalTypeOnPNFResource"/>
+          <include name="addInterfaceOperationsOnPNFResource"/>
+          <include name="getInterfaceOperationsFromPNFResource"/>
+          <include name="updateInterfaceOperationsOnPNFResource"/>
+          <include name="deleteInterfaceOperationsFromPNFResource"/>
+        </methods>
+      </class>
+      <!-- Product tests end-->
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Sanity -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
new file mode 100644
index 0000000000..320c3ccd43
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Sanity" configfailurepolicy="continue" verbose="2">
+
+  <test name="sanityE2Eflows">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/>
+    </classes>
+  </test>
+
+  <test name="General">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+        <methods>
+          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="ArtifactOnInstance">
+    <classes>
+    </classes>
+  </test>
+
+  <test name="Artifact">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+          <include name="downloadArtifactFromResourceTest"/>
+          <include name="downloadArtifactFromServiceTest"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Service">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+    </classes>
+  </test>
+
+  <test name="Resource">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <!-- Product tests end -->
+    </classes>
+  </test>
+  <test name="Catalog">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+    </classes>
+  </test>
+
+  <test name="distribution">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <include name="downloadResourceArtifactSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Category">
+    <classes>
+    </classes>
+  </test>
+
+  <test name="Imports">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        <methods>
+          <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
+          <include
+            name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+
+  <test name="attribute">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        <methods>
+          <include name="testUpdateAttributeOnResourceInstance"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="inputs">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests">
+        <methods>
+          <include name="testInputsMainFunctionality"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="property">
+    <classes>
+      <class
+        name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest">
+        <methods>
+          <include name="nestedVfResourceProperty3Levels"/>
+        </methods>
+      </class>
+
+    </classes>
+  </test>
+
+  <test name="User">
+    <classes>
+
+    </classes>
+  </test>
+
+  <test name="ExternalApis">
+    <classes>
+      <class name="org.openecomp.sdc.externalApis.GetAssetServlet">
+        <methods>
+          <include name="getResourceAssetSuccess"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+        <methods>
+          <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
+          <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
+        </methods>
+      </class>
+      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+        <methods>
+          <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
+          <include
+            name="getServiceAssetMetadataWithCertifiedResourceInstancesAndArtifactsOnRIsAndServiceSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/service.xml b/integration-tests/src/test/resources/ci/testSuites/service.xml
new file mode 100644
index 0000000000..9c662764ea
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/service.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Service">
+  <test name="Service">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+        <methods>
+          <include name="addInterfaceOperationsOnService"/>
+          <include name="getInterfaceOperationsFromService"/>
+          <include name="updateInterfaceOperationsOnService"/>
+          <include name="deleteInterfaceOperationsFromService"/>
+          <include name="testCreateOperationWithLocalInterfaceAndDownloadArtifact"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+</suite> <!-- Service -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
new file mode 100644
index 0000000000..7f1cba4d9c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="lifeCycle">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- lifeCycle -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/user.xml b/integration-tests/src/test/resources/ci/testSuites/user.xml
new file mode 100644
index 0000000000..3ab1f971fb
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="User">
+  <test name="Test">
+    <classes>
+      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- User -->