From c5c60bfb5889bfe63e310448d863192dd60078c5 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 25 Aug 2020 12:31:39 +0200
Subject: Add sdc startup in IT

Remove main method and move test suites for backend in a specific folder

Issue-ID: SDC-3232
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ic38534f5b5105c56fb5fe3124431c8146f9200d0
---
 .../src/test/resources/ci/conf/attsdc.yaml         |   2 +-
 .../test/resources/ci/testSuites/CRUDArtifacts.xml |  42 ----
 .../resources/ci/testSuites/ExternalApiSanity.xml  |  68 ------
 .../resources/ci/testSuites/SearchExternalAPI.xml  |  23 ---
 .../src/test/resources/ci/testSuites/artifacts.xml |  11 -
 .../ci/testSuites/backend/CRUDArtifacts.xml        |  42 ++++
 .../ci/testSuites/backend/ExternalApiSanity.xml    |  68 ++++++
 .../ci/testSuites/backend/SearchExternalAPI.xml    |  23 +++
 .../resources/ci/testSuites/backend/artifacts.xml  |  11 +
 .../resources/ci/testSuites/backend/cap_req.xml    |  10 +
 .../resources/ci/testSuites/backend/category.xml   |  10 +
 .../resources/ci/testSuites/backend/ciFull.xml     |  97 +++++++++
 .../ci/testSuites/backend/externalAPIs.xml         |  33 +++
 .../resources/ci/testSuites/backend/general.xml    |   9 +
 .../resources/ci/testSuites/backend/imports.xml    |   9 +
 .../resources/ci/testSuites/backend/normatives.xml |  25 +++
 .../ci/testSuites/backend/onapApiSanity.xml        |  11 +
 .../test/resources/ci/testSuites/backend/pass.xml  |  18 ++
 .../resources/ci/testSuites/backend/product.xml    |  12 ++
 .../ci/testSuites/backend/productAPIs.xml          |  15 ++
 .../resources/ci/testSuites/backend/property.xml   |  10 +
 .../resources/ci/testSuites/backend/resource.xml   | 123 +++++++++++
 .../resources/ci/testSuites/backend/sanity.xml     | 228 +++++++++++++++++++++
 .../resources/ci/testSuites/backend/service.xml    |  18 ++
 .../ci/testSuites/backend/testngLifeCycle.xml      |   9 +
 .../test/resources/ci/testSuites/backend/user.xml  |   9 +
 .../src/test/resources/ci/testSuites/cap_req.xml   |  10 -
 .../src/test/resources/ci/testSuites/category.xml  |  10 -
 .../src/test/resources/ci/testSuites/ciFull.xml    |  97 ---------
 .../test/resources/ci/testSuites/externalAPIs.xml  |  33 ---
 .../src/test/resources/ci/testSuites/general.xml   |   9 -
 .../src/test/resources/ci/testSuites/imports.xml   |   9 -
 .../test/resources/ci/testSuites/normatives.xml    |  25 ---
 .../test/resources/ci/testSuites/onapApiSanity.xml |  11 -
 .../src/test/resources/ci/testSuites/pass.xml      |  18 --
 .../src/test/resources/ci/testSuites/product.xml   |  12 --
 .../test/resources/ci/testSuites/productAPIs.xml   |  15 --
 .../src/test/resources/ci/testSuites/property.xml  |  10 -
 .../src/test/resources/ci/testSuites/resource.xml  | 123 -----------
 .../src/test/resources/ci/testSuites/sanity.xml    | 228 ---------------------
 .../src/test/resources/ci/testSuites/service.xml   |  18 --
 .../resources/ci/testSuites/testngLifeCycle.xml    |   9 -
 .../src/test/resources/ci/testSuites/user.xml      |   9 -
 43 files changed, 791 insertions(+), 791 deletions(-)
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/artifacts.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/artifacts.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/cap_req.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/category.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/general.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/imports.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/normatives.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/pass.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/product.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/property.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/resource.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/service.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/testngLifeCycle.xml
 create mode 100644 integration-tests/src/test/resources/ci/testSuites/backend/user.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/cap_req.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/category.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/ciFull.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/general.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/imports.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/normatives.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/pass.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/product.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/property.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/resource.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/sanity.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/service.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
 delete mode 100644 integration-tests/src/test/resources/ci/testSuites/user.xml

(limited to 'integration-tests/src/test/resources/ci')

diff --git a/integration-tests/src/test/resources/ci/conf/attsdc.yaml b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
index 29357b28b2..21dbe64d14 100644
--- a/integration-tests/src/test/resources/ci/conf/attsdc.yaml
+++ b/integration-tests/src/test/resources/ci/conf/attsdc.yaml
@@ -26,7 +26,7 @@ configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml
 importTypesConfigDir: src/test/resources/CI/importTypesTest
 
 
-janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties
+janusGraphPropertiesFile: src/test/resources/ci/conf/janusgraph.properties
 cassandraHost: 127.0.0.1
 cassandraAuthenticate: false
 cassandraUsername: koko
diff --git a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
deleted file mode 100644
index 0306e469ea..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index b17a8e69a0..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
-        <methods>
-            <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
-        <methods>
-            <include name="getResourceAssetBySpecifiedCategory"/>
-            <include name="getServiceAssetBySpecifiedCategory"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI">
-        <methods>
-            <include name="normativeResourceCategory" invocation-numbers="0"/>
-        </methods>
-      </class>      
-      <class name="org.onap.sdc.backend.externalApis.GetCSARofVF">
-        <methods>
-            <include name="getServiceToscaModelCheckInState"/>
-            <include name="getRsourceToscaModelCertifyState"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
-        <methods>
-            <include name="getResourceAssetBySpecifiedCategory"/>
-            <include name="getServiceAssetBySpecifiedCategory"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet">
-        <methods>
-            <include name="getResourceAssetMetadataSuccess"/>
-            <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index b401c281bf..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 1e27b81c66..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.PlaceHolderValidations"/>
-    </classes>
-  </test>
-</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/backend/CRUDArtifacts.xml
new file mode 100644
index 0000000000..0306e469ea
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.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/backend/ExternalApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/ExternalApiSanity.xml
new file mode 100644
index 0000000000..b17a8e69a0
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+            <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI">
+        <methods>
+            <include name="normativeResourceCategory" invocation-numbers="0"/>
+        </methods>
+      </class>      
+      <class name="org.onap.sdc.backend.externalApis.GetCSARofVF">
+        <methods>
+            <include name="getServiceToscaModelCheckInState"/>
+            <include name="getRsourceToscaModelCertifyState"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
+        <methods>
+            <include name="getResourceAssetBySpecifiedCategory"/>
+            <include name="getServiceAssetBySpecifiedCategory"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet">
+        <methods>
+            <include name="getResourceAssetMetadataSuccess"/>
+            <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.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/backend/SearchExternalAPI.xml b/integration-tests/src/test/resources/ci/testSuites/backend/SearchExternalAPI.xml
new file mode 100644
index 0000000000..b401c281bf
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.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/backend/artifacts.xml b/integration-tests/src/test/resources/ci/testSuites/backend/artifacts.xml
new file mode 100644
index 0000000000..1e27b81c66
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/backend/cap_req.xml
new file mode 100644
index 0000000000..9b1c6e54d3
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.requirements.RequirementsTest"/>
+			<class name="org.onap.sdc.backend.ci.tests.capability.CapabilitiesTest"/>
+		</classes>
+	</test>
+</suite> <!-- Artifacts -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/category.xml b/integration-tests/src/test/resources/ci/testSuites/backend/category.xml
new file mode 100644
index 0000000000..ef2c26fa5f
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.category.GroupingTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.SubCategoriesTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- category -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/backend/ciFull.xml
new file mode 100644
index 0000000000..963c568a8f
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.GroupingTest">
+        <methods>
+          <exclude name="createProductGroupForNonExistingCategory"/>
+          <exclude name="createProductGroupForNonExistingSunCategory"/>
+          <exclude name="getProductCategoryHierarchySuccessFlow"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests"/>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+  <test name="General">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test>
+  <test name="Resource">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.SimultaneousApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <exclude name="UpdateResourceCategory_negativeFlow"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest"/>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.resource.ValidateExtendedVfData"/>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <exclude name="undoCheckOutNotExist"/>
+        </methods>
+      </class>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <exclude name="checkInProductNotExist"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class
+        name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
+    </classes>
+  </test>
+  <test name="Artifacts">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+    </classes>
+  </test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/backend/externalAPIs.xml
new file mode 100644
index 0000000000..637ec3e4fa
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.externalApis.VFCMTExternalAPI"/>
+			<class name="org.onap.sdc.backend.externalApis.CRUDExternalAPI"/>
+			<class name="org.onap.sdc.backend.externalApis.DeploymentValiditaion"/>
+ 			<class name="org.onap.sdc.backend.externalApis.GetAssetServlet"/>
+			<class name="org.onap.sdc.backend.externalApis.GetCSARofVF"/>
+			<class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet"/>
+			<class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet"/>
+			<class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI"/>
+			<class name="org.onap.sdc.backend.externalApis.AssetLifeCycle"/>
+			<class name="org.onap.sdc.backend.externalApis.UserAPIs"/>
+
+			<class name="org.onap.sdc.backend.internalApis.annotations.AnnotationsTest"/>
+
+			
+<!-- 	      <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
+			      <class name="ProductCheckinTest"/>
+			      <class name="ProductCheckoutTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
+			      <class name="ProductCreateWithValidationsTest"/>
+			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
+			      <class name="ProductGetFollowedTest"/>
+			      <class name="ProductUndoCheckoutTest"/>    -->
+			
+			
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/general.xml b/integration-tests/src/test/resources/ci/testSuites/backend/general.xml
new file mode 100644
index 0000000000..9ee63871bf
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.general.UuidTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- General -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/imports.xml b/integration-tests/src/test/resources/ci/testSuites/backend/imports.xml
new file mode 100644
index 0000000000..56d9010383
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Imports -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/normatives.xml b/integration-tests/src/test/resources/ci/testSuites/backend/normatives.xml
new file mode 100644
index 0000000000..8e633e2bac
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+		</classes>
+	</test>
+</suite> 
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
new file mode 100644
index 0000000000..9f189107a5
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.sanity.Onboard"/>
+		</classes>
+	</test>
+</suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml b/integration-tests/src/test/resources/ci/testSuites/backend/pass.xml
new file mode 100644
index 0000000000..00df382cef
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.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/backend/product.xml b/integration-tests/src/test/resources/ci/testSuites/backend/product.xml
new file mode 100644
index 0000000000..559fc54514
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.product.ProductLifecycleTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Product -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/backend/productAPIs.xml
new file mode 100644
index 0000000000..bd5f06da15
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class name="org.onap.sdc.backend.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/backend/property.xml b/integration-tests/src/test/resources/ci/testSuites/backend/property.xml
new file mode 100644
index 0000000000..cb8875ac64
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Property -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml b/integration-tests/src/test/resources/ci/testSuites/backend/resource.xml
new file mode 100644
index 0000000000..c2dd49011c
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        <methods>
+          <include name="downloadResourceArtifactSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest">
+        <methods>
+          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+        <methods>
+          <include name="authorizeDeActivatedUser"/>
+        </methods>
+      </class>
+
+      <!-- Product tests start-->
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.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/backend/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/sanity.xml
new file mode 100644
index 0000000000..09323f2ea2
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.sanity.CrudE2E"/>
+    </classes>
+  </test>
+
+  <test name="General">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
+        <methods>
+          <include name="downloadArtifactFromResourceTest"/>
+          <include name="downloadArtifactFromServiceTest"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="Service">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
+        <methods>
+          <include name="testServiceAuditCertifiedVersion"/>
+        </methods>
+      </class>
+
+    </classes>
+  </test>
+
+  <test name="Resource">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
+        <methods>
+          <include name="getResourceAllVersions_version15"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
+        <methods>
+          <include name="updateResourceMetadataSuccess"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        <methods>
+          <include name="UpdateDerivedFromSuccess"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+  <test name="Product">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
+        <methods>
+          <include name="checkInProductByCreator"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
+        <methods>
+          <include name="checkOutProductByPmNotInContacts"/>
+        </methods>
+      </class>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
+        <methods>
+          <include name="followedPageTest"/>
+        </methods>
+      </class>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
+        <methods>
+          <include name="undoCheckOutProductByPm"/>
+        </methods>
+      </class>
+      <!-- Product tests end -->
+    </classes>
+  </test>
+  <test name="Catalog">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
+    </classes>
+  </test>
+
+  <test name="distribution">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
+        <methods>
+          <include name="downloadServiceArtifactSuccessWithAutantication"/>
+        </methods>
+      </class>
+
+      <class
+        name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
+        <methods>
+          <include name="importAllTestResources"/>
+          <include name="testImportCheckoutAndUpdateUserResource"/>
+          <include name="testImportWithUpdateNormativeType"/>
+        </methods>
+      </class>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        <methods>
+          <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
+          <include
+            name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/>
+        </methods>
+      </class>
+    </classes>
+  </test> <!-- Test -->
+
+  <test name="attribute">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        <methods>
+          <include name="testUpdateAttributeOnResourceInstance"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="inputs">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.inputs.InputsApiTests">
+        <methods>
+          <include name="testInputsMainFunctionality"/>
+        </methods>
+      </class>
+    </classes>
+  </test>
+
+  <test name="property">
+    <classes>
+      <class
+        name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
+        <methods>
+          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
+          <include name="updateResourceAdditionalInformationTest"/>
+          <include name="deleteResourceAdditionalInformationTest"/>
+        </methods>
+      </class>
+
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
+        <methods>
+          <include name="testPropertyApis"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.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.onap.sdc.backend.externalApis.GetAssetServlet">
+        <methods>
+          <include name="getResourceAssetSuccess"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
+        <methods>
+          <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
+          <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.backend.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/backend/service.xml b/integration-tests/src/test/resources/ci/testSuites/backend/service.xml
new file mode 100644
index 0000000000..05300baf4b
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="org.onap.sdc.backend.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/backend/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/testSuites/backend/testngLifeCycle.xml
new file mode 100644
index 0000000000..9ae3cfda21
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- lifeCycle -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/user.xml b/integration-tests/src/test/resources/ci/testSuites/backend/user.xml
new file mode 100644
index 0000000000..ddd90b1aa8
--- /dev/null
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/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.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- User -->
diff --git a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
deleted file mode 100644
index 9b1c6e54d3..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.requirements.RequirementsTest"/>
-			<class name="org.onap.sdc.backend.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
deleted file mode 100644
index ef2c26fa5f..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/category.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.category.GroupingTest"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index 963c568a8f..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.category.GroupingTest">
-        <methods>
-          <exclude name="createProductGroupForNonExistingCategory"/>
-          <exclude name="createProductGroupForNonExistingSunCategory"/>
-          <exclude name="getProductCategoryHierarchySuccessFlow"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests"/>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
-        <methods>
-          <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-  <test name="General">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest"/>
-    </classes>
-  </test>
-  <test name="Resource">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.SimultaneousApiTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
-        <methods>
-          <exclude name="UpdateResourceCategory_negativeFlow"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest"/>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.resource.ValidateExtendedVfData"/>
-    </classes>
-  </test>
-  <test name="Product">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
-        <methods>
-          <exclude name="undoCheckOutNotExist"/>
-        </methods>
-      </class>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
-        <methods>
-          <exclude name="checkInProductNotExist"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
-      <class
-        name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
-    </classes>
-  </test>
-  <test name="Artifacts">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index 637ec3e4fa..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.onap.sdc.backend.externalApis.VFCMTExternalAPI"/>
-			<class name="org.onap.sdc.backend.externalApis.CRUDExternalAPI"/>
-			<class name="org.onap.sdc.backend.externalApis.DeploymentValiditaion"/>
- 			<class name="org.onap.sdc.backend.externalApis.GetAssetServlet"/>
-			<class name="org.onap.sdc.backend.externalApis.GetCSARofVF"/>
-			<class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet"/>
-			<class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet"/>
-			<class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI"/>
-			<class name="org.onap.sdc.backend.externalApis.AssetLifeCycle"/>
-			<class name="org.onap.sdc.backend.externalApis.UserAPIs"/>
-
-			<class name="org.onap.sdc.backend.internalApis.annotations.AnnotationsTest"/>
-
-			
-<!-- 	      <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
-			      <class name="ProductCheckinTest"/>
-			      <class name="ProductCheckoutTest"/>
-			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
-			      <class name="ProductCreateWithValidationsTest"/>
-			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
-			      <class name="ProductGetFollowedTest"/>
-			      <class name="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
deleted file mode 100644
index 9ee63871bf..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/general.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 56d9010383..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/imports.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 8e633e2bac..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/normatives.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 9f189107a5..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 00df382cef..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/pass.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index 559fc54514..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/product.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.product.ProductLifecycleTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index bd5f06da15..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index cb8875ac64..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/property.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index c2dd49011c..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/resource.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
-        <methods>
-          <include name="downloadServiceArtifactSuccessWithAutantication"/>
-        </methods>
-      </class>
-
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
-        <methods>
-          <include name="downloadResourceArtifactSuccess"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest">
-        <methods>
-          <include name="testE2EUuidHeaderReturnedAndPreserved"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
-        <methods>
-          <include name="importAllTestResources"/>
-          <include name="testImportCheckoutAndUpdateUserResource"/>
-          <include name="testImportWithUpdateNormativeType"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
-        <methods>
-          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
-          <include name="updateResourceAdditionalInformationTest"/>
-          <include name="deleteResourceAdditionalInformationTest"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
-        <methods>
-          <include name="testPropertyApis"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
-        <methods>
-          <include name="getResourceAllVersions_version15"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
-        <methods>
-          <include name="updateResourceMetadataSuccess"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
-        <methods>
-          <include name="UpdateDerivedFromSuccess"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
-        <methods>
-          <include name="testServiceAuditCertifiedVersion"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser">
-        <methods>
-          <include name="authorizeDeActivatedUser"/>
-        </methods>
-      </class>
-
-      <!-- Product tests start-->
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
-        <methods>
-          <include name="checkInProductByCreator"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
-        <methods>
-          <include name="checkOutProductByPmNotInContacts"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
-        <methods>
-          <include name="followedPageTest"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
-        <methods>
-          <include name="undoCheckOutProductByPm"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index 09323f2ea2..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/sanity.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.sanity.CrudE2E"/>
-    </classes>
-  </test>
-
-  <test name="General">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
-        <methods>
-          <include name="downloadArtifactFromResourceTest"/>
-          <include name="downloadArtifactFromServiceTest"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="Service">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
-        <methods>
-          <include name="testServiceAuditCertifiedVersion"/>
-        </methods>
-      </class>
-
-    </classes>
-  </test>
-
-  <test name="Resource">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
-        <methods>
-          <include name="getResourceAllVersions_version15"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
-        <methods>
-          <include name="updateResourceMetadataSuccess"/>
-        </methods>
-      </class>
-
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
-        <methods>
-          <include name="UpdateDerivedFromSuccess"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-  <test name="Product">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
-        <methods>
-          <include name="checkInProductByCreator"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
-        <methods>
-          <include name="checkOutProductByPmNotInContacts"/>
-        </methods>
-      </class>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
-        <methods>
-          <include name="followedPageTest"/>
-        </methods>
-      </class>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
-        <methods>
-          <include name="undoCheckOutProductByPm"/>
-        </methods>
-      </class>
-      <!-- Product tests end -->
-    </classes>
-  </test>
-  <test name="Catalog">
-    <classes>
-      <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
-    </classes>
-  </test>
-
-  <test name="distribution">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
-        <methods>
-          <include name="downloadServiceArtifactSuccessWithAutantication"/>
-        </methods>
-      </class>
-
-      <class
-        name="org.onap.sdc.backend.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.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
-        <methods>
-          <include name="importAllTestResources"/>
-          <include name="testImportCheckoutAndUpdateUserResource"/>
-          <include name="testImportWithUpdateNormativeType"/>
-        </methods>
-      </class>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
-        <methods>
-          <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
-          <include
-            name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed"/>
-        </methods>
-      </class>
-    </classes>
-  </test> <!-- Test -->
-
-  <test name="attribute">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
-        <methods>
-          <include name="testUpdateAttributeOnResourceInstance"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="inputs">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.inputs.InputsApiTests">
-        <methods>
-          <include name="testInputsMainFunctionality"/>
-        </methods>
-      </class>
-    </classes>
-  </test>
-
-  <test name="property">
-    <classes>
-      <class
-        name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
-        <methods>
-          <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
-          <include name="updateResourceAdditionalInformationTest"/>
-          <include name="deleteResourceAdditionalInformationTest"/>
-        </methods>
-      </class>
-
-      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
-        <methods>
-          <include name="testPropertyApis"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.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.onap.sdc.backend.externalApis.GetAssetServlet">
-        <methods>
-          <include name="getResourceAssetSuccess"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
-        <methods>
-          <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
-          <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
-        </methods>
-      </class>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index 05300baf4b..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/service.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
-      <class name="org.onap.sdc.backend.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
deleted file mode 100644
index 9ae3cfda21..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.onap.sdc.backend.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
deleted file mode 100644
index ddd90b1aa8..0000000000
--- a/integration-tests/src/test/resources/ci/testSuites/user.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- User -->
-- 
cgit 1.2.3-korg