[SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>

6 files changed, 92 insertions, 14 deletions

diff --git a/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml
new file mode 100644
index 0000000000..e53da8da8a
--- /dev/null
+++ b/asdc-tests/src/main/resources/ci/testSuites/CRUDArtifacts.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
+
+  <test name="Test">
+    <classes>
+      <class 
+      name="org.openecomp.sdc.ci.tests.execute.devCI.CRUDExternalAPI">
+   			   <methods>
+					<include name="uploadArtifactOnVFViaExternalAPI" />
+					<include name="uploadArtifactOnServiceViaExternalAPI" />
+					<include name="uploadArtifactOnRIViaExternalAPI" />
+					<include name="uploadInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+					<include name="uploadArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="uploadArtifactOnAssetWhichNotExist" />
+					<include name="uploadArtifactOnAssetWhichInInvalidStateForUploading" />
+					
+					
+					<include name="updateArtifactForServiceViaExternalAPI" />
+					<include name="updateArtifactForVFViaExternalAPI" />
+					<include name="updateArtifactOnRIViaExternalAPI" />
+					<include name="updateArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="updateArtifactOnAssetWhichNotExist" />
+					<include name="updateArtifactOnAssetWhichInInvalidStateForUploading" />
+					<include name="updateInvalidArtifactTypeExtensionLabelDescriptionCheckSumDuplicateLabelViaExternalAPI" />
+					
+					
+					<include name="deleteArtifactForServiceViaExternalAPI" />
+					<include name="deleteArtifactForVFViaExternalAPI" />
+					<include name="deleteArtifactOnRIViaExternalAPI" />
+					<include name="deleteArtifactOnVFViaExternalAPIByDiffrentUserThenCreatorOfAsset" />
+					<include name="deleteArtifactOnAssetWhichNotExist" />
+					<include name="deleteArtifactOnAssetWhichInInvalidStateForUploading" />
+				</methods>
+      
+      </class>
+      
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml b/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml
new file mode 100644
index 0000000000..40c462a4cb
--- /dev/null
+++ b/asdc-tests/src/main/resources/ci/testSuites/SearchExternalAPI.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2"  parallel="tests" thread-count="10">
+
+  <test name="Test">
+    <classes>
+      <class 
+      name="org.openecomp.sdc.ci.tests.execute.devCI.SearchFilterCategoryExternalAPI">
+   			   <methods>
+
+					<include name="searchWithInvalidFilter" />
+					<include name="searchForResourceTypeNegativeTest" />
+					<include name="searchingForResouceFilterIncorrectResouceTypeUsingExternalAPI" />
+					<include name="searchingForSeveralResouceTypesUsingExternalAPI" />
+					<include name="searchingForSeveralResourcesOfTypeVFCMTUsingExternalAPI" />
+					<include name="normativeResourceCategory" />		
+				</methods>
+      
+      </class>
+      
+    </classes>
+  </test> <!-- Test -->
+</suite> <!-- Suite -->
\ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
index 9877670a90..26a85fd9c6 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/ciFull.xml
@@ -177,7 +177,7 @@
 					<exclude name="dissociateOnceAgainTest" />
 					<exclude name="dissociateRelationNotFoundTest" />
 					<exclude name="dissoicateRelationWhileInstanceNotFound" />
-					<exclude name="dissoicateWithEmptyUserIdsHeaderTest" />
+					<exclude name="dissoicateWithEmptyUserIdHeaderTest" />
 					<exclude name="relationDeletedAfterDeletingResourceInstanceTest" />
 				</methods>
 			</class>
diff --git a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml b/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
index 5db368ecf4..393d3b1a3e 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/externalApis.xml
@@ -6,6 +6,9 @@
 			<class name="org.openecomp.sdc.externalApis.GetAssetServlet" />
 			<class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
 			<class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
+			<class name="org.openecomp.sdc.ci.tests.execute.devCI.CRUDExternalAPI"/>
+			<class name="org.openecomp.sdc.ci.tests.execute.devCI.SearchFilterCategoryExternalAPI"/>
+			<class name="org.openecomp.sdc.ci.tests.execute.externalapi.UserAPIs"/>
 		</classes>
 	</test>
 </suite> 
\ No newline at end of file
diff --git a/asdc-tests/src/main/resources/ci/testSuites/resource.xml b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
index 5f23325790..803fb01e70 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/resource.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/resource.xml
@@ -30,6 +30,30 @@
 			  </methods>
 		</class>
 		
+		<class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArt">
+			  <methods>
+				<include name="UpdateAllResourceMandatoryArtifacts"/>
+				<include name="updateInformationalArtifactMetadataOfResource"/>
+			  </methods>
+		</class>
+		<class name="org.openecomp.sdc.ci.tests.execute.artifacts.InformationalArtCloudQuestionnaire">
+			  <methods>
+				<include name="updateMandatoryInformationalArtifact_CloudQuestionnaire"/>
+			  </methods>
+		</class>  
+		<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceApiArtifactTest">
+			  <methods>
+				<include name="uploadServiceApiArtifactSuccessfullyTest"/>
+				<include name="updateApiArtifactSuccessfullyTest"/>
+				<include name="deleteApiArtifactSuccessfully"/>
+			  </methods>
+		</class>  
+		<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ServiceInformationalArtifact">
+			  <methods>
+				<include name="updateMandatoryInformationalArtifact_ServiceQuestionnaire"/>
+			  </methods>
+		</class> 
+		
 		<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse"/>
 		
 		<class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
diff --git a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
index 11b4b79fc4..8e787bc8cd 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Sanity" configfailurepolicy="continue" verbose="2">
 
-   <listeners>
-        <listener class-name="org.openecomp.sdc.ci.tests.run.ExtentReporterNG" />
-    </listeners>
-
 	<test name="sanityE2Eflows">
 		<classes>
 			<class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E" />
@@ -69,8 +65,6 @@
 				</methods>
 			</class>
 
-		
-
 			<class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateArtResponse" />
 			
 			
@@ -268,15 +262,9 @@
 				name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
 				<methods>
 					<include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed" />
-					<!--
-					This test require the onboarding simulator. 
-					<include name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed" /> 
-					-->
+					<include name="importResourceWithCapabilityWithPropertiesOverridingCapTypePropertiesSucceed" />
 				</methods>
 			</class>
-			<class
-				name="org.openecomp.sdc.ci.tests.execute.imports.CsarUtilsTest">
-			</class>
 		</classes>
 	</test> <!-- Test -->