Add sdc startup in IT

Rework the java packages so that we use onap now + fix the folders written outside of the target folder

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

21 files changed, 118 insertions, 118 deletions

diff --git a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
index 005bdba0f3..6188116210 100644
--- a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
+++ b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
@@ -3,7 +3,7 @@
 <suite name="lifeCycle" parallel="none">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
index 923777542c..78c93723fa 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
@@ -5,7 +5,7 @@
   <test name="Test">
     <classes>
       <class 
-      name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      name="CRUDExternalAPI">
    			   <methods>
 				<!-- 	<include name="uploadArtifactOnVFViaExternalAPI" />
 					<include name="uploadArtifactOnServiceViaExternalAPI" />
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
index 02594526cb..633054fb13 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
@@ -4,7 +4,7 @@
 
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      <class name="CRUDExternalAPI">
    		<methods>
 			<include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
 			<include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
@@ -24,41 +24,41 @@
 			<include name="deleteArtifactOnAssetWhichNotExist" />			
 		</methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+      <class name="DownloadComponentArt">
         <methods>
             <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+      <class name="SearchFilterCategoryExternalAPI">
         <methods>
             <include name="normativeResourceCategory" invocation-numbers="0"/>
         </methods>
       </class>      
-      <class name="org.openecomp.sdc.externalApis.GetCSARofVF">
+      <class name="GetCSARofVF">
         <methods>
             <include name="getServiceToscaModelCheckInState"/>
             <include name="getRsourceToscaModelCertifyState"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="GetSpecificAssetMetadataServlet">
         <methods>
             <include name="getResourceAssetMetadataSuccess"/>
             <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.AssetLifeCycle">
+      <class name="AssetLifeCycle">
         <methods>
             <include name="theFlow"/>
         </methods>
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
index 1352e75d58..6a018ab0f0 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
@@ -3,9 +3,9 @@
 <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"/>
+      <class name="DownloadComponentArt"/>
+      <class name="ValidateHeatArtFieldsTypes"/>
+      <class name="PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> <!-- Artifacts -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml b/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
index 8298af2da5..4fefeaf679 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
@@ -3,8 +3,8 @@
 <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"/>
+			<class name="RequirementsTest"/>
+			<class name="CapabilitiesTest"/>
 		</classes>
 	</test>
 </suite> <!-- Artifacts -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/category.xml b/test-apis-ci/src/main/resources/ci/testSuites/category.xml
index 3de83431e8..b6f64fc9e8 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/category.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/category.xml
@@ -3,8 +3,8 @@
 <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"/>
+      <class name="GroupingTest"/>
+      <class name="SubCategoriesTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- category -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
index 47624c6266..35239c7ce1 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
@@ -3,8 +3,8 @@
 <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">
+      <class name="CatalogDataApiTest"/>
+      <class name="GroupingTest">
         <methods>
           <exclude name="createProductGroupForNonExistingCategory"/>
           <exclude name="createProductGroupForNonExistingSunCategory"/>
@@ -12,7 +12,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest">
+      <class name="SubCategoriesTest">
         <methods>
           <exclude name="createProductSubCategoryForNonExistingCategory"/>
           <exclude name="createResourceSubCategoryForNonExistingCategory"/>
@@ -24,9 +24,9 @@
   <test name="Distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/>
+        name="AuthanticationTests"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
         </methods>
@@ -35,44 +35,44 @@
   </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"/>
+      <class name="FeProxyTest"/>
+      <class name="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">
+      <class name="SimultaneousApiTest"/>
+      <class name="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="VFResourceInstanceNameCRUD"/>
+      <class name="ResourceApiTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/>
+        name="ValidateExtendedVfData"/>
     </classes>
   </test>
   <test name="Product">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="ProductUndoCheckoutTest">
         <methods>
           <exclude name="undoCheckOutNotExist"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+        name="ProductGetFollowedTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        name="ProductToscaYamlGenerationTest"/>
+      <class name="ProductCheckinTest">
         <methods>
           <exclude name="checkInProductNotExist"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="ProductCheckoutTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest">
+        name="ProductCreateWithValidationsTest">
         <methods>
           <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
           <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
@@ -104,14 +104,14 @@
           <exclude name="rejectServiceNotFound"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="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"/>
+      <class name="DownloadComponentArt"/>
+      <class name="ValidateHeatArtFieldsTypes"/>
+      <class name="PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> 
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
index 7c9d6d9d9c..b83761833e 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
@@ -4,28 +4,28 @@
 	<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="VFCMTExternalAPI"/>
+			<class name="CRUDExternalAPI"/>
+			<class name="DeploymentValiditaion"/>
+ 			<class name="GetAssetServlet"/>
+			<class name="GetCSARofVF"/>
+			<class name="GetFilteredAssetServlet"/>
+			<class name="GetSpecificAssetMetadataServlet"/>
+			<class name="SearchFilterCategoryExternalAPI"/>
+			<class name="AssetLifeCycle"/>
+			<class name="UserAPIs"/>
 
-			<class name="org.openecomp.sdc.internalApis.annotations.AnnotationsTest"/>
+			<class name="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="ProductCheckinTest"/>
+			      <class name="ProductCheckoutTest"/>
 			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
-			      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+			      <class name="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"/>    -->
+			      <class name="ProductGetFollowedTest"/>
+			      <class name="ProductUndoCheckoutTest"/>    -->
 			
 			
 		</classes>
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/general.xml b/test-apis-ci/src/main/resources/ci/testSuites/general.xml
index a63f36423e..9b988d8b12 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/general.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/general.xml
@@ -3,7 +3,7 @@
 <suite name="General">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+      <class name="UuidTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- General -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
index b9374cf47a..3cf3b9833b 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
@@ -3,7 +3,7 @@
 <suite name="Imports">
   <test name="Imports">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+      <class name="ImportGenericResourceCITest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Imports -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml b/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
index 02da714578..9676e8f398 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
@@ -19,7 +19,7 @@
 <suite name="normatives" >
 	<test name="InterfaceLifecycleTypes">
 		<classes>
-			<class name="org.openecomp.sdc.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+			<class name="InterfaceLifecycleTypesTest"/>
 		</classes>
 	</test>
 </suite> 
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
index 9fcd043cd3..00f60cb68e 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
@@ -5,7 +5,7 @@
 	<parameter name="makeToscaValidation"  value="true"/>
 	<test name="ExternalApis"> 
 		<classes>
-			<class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/>
+			<class name="Onboard"/>
 		</classes>
 	</test>
 </suite>
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml b/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
index 731d73675c..02a314f8e9 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
@@ -7,7 +7,7 @@
 
  <classes>
     <class
-            name="org.openecomp.sdc.ci.tests.sanity.Onboard">
+            name="Onboard">
         <methods>
             <include name="passTest" />
         </methods>
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/product.xml b/test-apis-ci/src/main/resources/ci/testSuites/product.xml
index 101b94a6bb..72fb68b197 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/product.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/product.xml
@@ -3,10 +3,10 @@
 <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"/>
+      <class name="ProductLifecycleTest"/>
+      <class name="ProductUndoCheckoutTest"/>
+      <class name="ProductCheckinTest"/>
+      <class name="ProductCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Product -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
index df9aa9f152..f3f7f912a1 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
@@ -5,11 +5,11 @@
 
   <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"/>
+      <class name="ProductCheckinTest"/>
+      <class name="ProductCheckoutTest"/>
+      <class name="ProductCreateWithValidationsTest"/>
+      <class name="ProductGetFollowedTest"/>
+      <class name="ProductUndoCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Suite -->
\ No newline at end of file
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/property.xml b/test-apis-ci/src/main/resources/ci/testSuites/property.xml
index f94f89737a..2b90f9b2f6 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/property.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/property.xml
@@ -3,9 +3,9 @@
 <suite name="Property" >
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="PropertyApisTest"/>
       <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyServletTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"/>
+      <class name="AdditionalInformationServletTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Property -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
index 4fd0e43a02..c9f5558449 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
@@ -5,30 +5,30 @@
   <test verbose="2" name="Sanity">
     <classes>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="CatalogDataApiTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+      <class name="AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="FeProxyTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+      <class name="UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+      <class name="ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -36,7 +36,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+      <class name="AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -44,66 +44,66 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+      <class name="GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+      <class name="UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+      <class name="GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+      <class name="ActivateDeActivateDeleteUser">
         <methods>
           <include name="authorizeDeActivatedUser"/>
         </methods>
       </class>
 
       <!-- Product tests start-->
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+      <class name="ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+      <class name="ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
           <include name="addInterfaceOperationsOnResource"/>
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
index 320c3ccd43..5d21455530 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
@@ -4,14 +4,14 @@
 
   <test name="sanityE2Eflows">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/>
+      <class name="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">
+      <class name="FeProxyTest"/>
+      <class name="UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
@@ -27,7 +27,7 @@
   <test name="Artifact">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        name="DownloadComponentArt">
         <methods>
           <include name="downloadArtifactFromResourceTest"/>
           <include name="downloadArtifactFromServiceTest"/>
@@ -39,7 +39,7 @@
   <test name="Service">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        name="GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
@@ -51,20 +51,20 @@
   <test name="Resource">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        name="GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        name="UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
@@ -73,24 +73,24 @@
   </test>
   <test name="Product">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        name="ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
@@ -100,21 +100,21 @@
   </test>
   <test name="Catalog">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="CatalogDataApiTest"/>
     </classes>
   </test>
 
   <test name="distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        name="AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
@@ -130,7 +130,7 @@
   <test name="Imports">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        name="ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -138,7 +138,7 @@
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        name="ImportToscaCapabilitiesWithProperties">
         <methods>
           <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
           <include
@@ -151,7 +151,7 @@
   <test name="attribute">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        name="ComponentInstanceAttributeTest">
         <methods>
           <include name="testUpdateAttributeOnResourceInstance"/>
         </methods>
@@ -162,7 +162,7 @@
   <test name="inputs">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests">
+        name="InputsApiTests">
         <methods>
           <include name="testInputsMainFunctionality"/>
         </methods>
@@ -173,7 +173,7 @@
   <test name="property">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        name="AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -181,12 +181,12 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest">
+      <class name="ComponentInstancePropertyTest">
         <methods>
           <include name="nestedVfResourceProperty3Levels"/>
         </methods>
@@ -203,18 +203,18 @@
 
   <test name="ExternalApis">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.GetAssetServlet">
+      <class name="GetAssetServlet">
         <methods>
           <include name="getResourceAssetSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
           <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
           <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="GetSpecificAssetMetadataServlet">
         <methods>
           <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
           <include
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/service.xml b/test-apis-ci/src/main/resources/ci/testSuites/service.xml
index 4b2842d7fc..89f4819cc1 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/service.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/service.xml
@@ -4,8 +4,8 @@
   <test name="Service">
     <classes>
       <class name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="GetAllServiceVersions"/>
+      <class name="InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOnService"/>
           <include name="getInterfaceOperationsFromService"/>
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
index 7f1cba4d9c..f65ef786e2 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
@@ -3,7 +3,7 @@
 <suite name="lifeCycle">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->
diff --git a/test-apis-ci/src/main/resources/ci/testSuites/user.xml b/test-apis-ci/src/main/resources/ci/testSuites/user.xml
index 3ab1f971fb..b4a5b932fd 100644
--- a/test-apis-ci/src/main/resources/ci/testSuites/user.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/user.xml
@@ -3,7 +3,7 @@
 <suite name="User">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+      <class name="ActivateDeActivateDeleteUser"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- User -->