diff options
Diffstat (limited to 'test-apis-ci/src/main/resources')
7 files changed, 78 insertions, 19 deletions
diff --git a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml b/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml index 904b3d1327..5ee9d0590e 100644 --- a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml @@ -42,6 +42,8 @@ cassandraAuditKeySpace: sdcaudit cassandraArtifactKeySpace: sdcartifact url: http://localhost:8181/sdc1/proxy-designer1#/dashboard +sdcHttpMethod: https +localDataCenter: DC-Automate01 stopOnClassFailure: false diff --git a/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh b/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh index 1b6f0258d6..e695db26b2 100644 --- a/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh +++ b/test-apis-ci/src/main/resources/ci/scripts/addUsersFromList_new.sh @@ -46,12 +46,12 @@ function addUser () firstName=`echo $user|awk '{print $3}'` lastName=`echo $user|awk '{print $4}'` email=`echo $user|awk '{print $5}'` - curl --noproxy '*' -i -X post -d '{ "userId" : "'${userId}'", "role" : "'${role}'", "firstName" : "'${firstName}'", "lastName" : "'${lastName}'", "email" : "'${email}'" }' -H "Content-Type: application/json" -H "USER_ID: jh0003" http://${IP}:8080/sdc2/rest/v1/user + curl --noproxy '*' -i -X post -d '{ "userId" : "'${userId}'", "role" : "'${role}'", "firstName" : "'${firstName}'", "lastName" : "'${lastName}'", "email" : "'${email}'" }' -H "Content-Type: application/json" -H "USER_ID: jh0003" https://${IP}:8443/sdc2/rest/v1/user else echo "Host" $IP "Is Unreachable" fi done -curl --noproxy '*' -i -X post -d '{"consumerName": "ci","consumerSalt": "2a1f887d607d4515d4066fe0f5452a50","consumerPassword": "0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b"}' -H "Content-Type: application/json" -H "USER_ID: jh0003" -H "Authorization:Basic Y2k6MTIzNDU2" http://${IP}:8080/sdc2/rest/v1/consumers +curl --noproxy '*' -i -X post -d '{"consumerName": "ci","consumerSalt": "2a1f887d607d4515d4066fe0f5452a50","consumerPassword": "0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b"}' -H "Content-Type: application/json" -H "USER_ID: jh0003" -H "Authorization:Basic Y2k6MTIzNDU2" https://${IP}:8443/sdc2/rest/v1/consumers } diff --git a/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh b/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh index 4c23a7973e..d2b142a20c 100644 --- a/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh +++ b/test-apis-ci/src/main/resources/ci/scripts/sendMail.sh @@ -6,9 +6,9 @@ REPORT_NAME=$1 VERSION=$2 ENV=$3 -RECIPIENTS1="dl-sdcqa@intl.att.com,ml636r@intl.att.com,bl5783intl.att.com,ak314p@intl.att.com,el489u@intl.att.com,hk096q@intl.att.com,bs5719@intl.att.com" -RECIPIENTS2="dl-asdcqa@intl.att.com" - +RECIPIENTS1="dl-sdcqa@att.com,ml636r@att.com,bl5783@att.com,ak314p@att.com,el489u@att.com,hk096q@att.com,bs5719@att.com" +#RECIPIENTS2="dl-asdcqa@intl.att.com" +RECIPIENTS2="md9897@att.com,ms656r@att.com,al714h@att.com,ak991p@att.com,ya107f@att.com,bv095y@att.com,st198j@att.com,th0695@att.com,vk195d@att.com,gg980r@att.com,il0695@att.com,el489u@att.com" source ExtentReport/versions.info if [ -z "$REPORT_NAME" ] then diff --git a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh b/test-apis-ci/src/main/resources/ci/scripts/startTest.sh index 764e046653..88c9521ac4 100644 --- a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh +++ b/test-apis-ci/src/main/resources/ci/scripts/startTest.sh @@ -91,7 +91,7 @@ ADD_USERS_SCRIPT="addUsersFromList_new.sh" USER_LIST="conf/userList.txt" chmod +x ${ADD_USERS_SCRIPT} echo "add users..." -`./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}` +./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST} @@ -137,7 +137,7 @@ fi COPY_REPORT_SCRIPT="copyToStorage.sh" chmod +x ${COPY_REPORT_SCRIPT} echo "copy report to storage..." -sh ./${COPY_REPORT_SCRIPT} ${REPORT_NAME} ${VERSION} ${MYENV} +( ./${COPY_REPORT_SCRIPT} ${REPORT_NAME} ${VERSION} ${MYENV} ) MAILING_SCRIPT_NAME="sendMail.sh" diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml new file mode 100644 index 0000000000..02594526cb --- /dev/null +++ b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> +<suite name="CRUDArtifacts" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="2" data-provider-thread-count="2"> + + <test name="Test"> + <classes> + <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI"> + <methods> + <include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" /> + <include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" /> + <include name="uploadArtifactOnServiceViaExternalAPI" invocation-numbers="0" /> + <include name="uploadArtifactOnRIViaExternalAPI" invocation-numbers="0" /> + <include name="uploadArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactForServiceViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactForVFViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactForVfcVlCpViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactOfVfcVlCpForVfciVliCpiViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactOnRIViaExternalAPI" invocation-numbers="0" /> + <include name="updateArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" /> + <include name="deleteArtifactForServiceViaExternalAPI" invocation-numbers="0" /> + <include name="deleteArtifactForVFViaExternalAPI" invocation-numbers="0" /> + <include name="deleteArtifactOnRIViaExternalAPI" invocation-numbers="0" /> + <include name="deleteArtifactOnVfcVlCpRIViaExternalAPI" invocation-numbers="0" /> + <include name="deleteArtifactOnAssetWhichNotExist" /> + </methods> + </class> + <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"> + <methods> + <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"> + <methods> + <include name="getResourceAssetBySpecifiedCategory"/> + <include name="getServiceAssetBySpecifiedCategory"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI"> + <methods> + <include name="normativeResourceCategory" invocation-numbers="0"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetCSARofVF"> + <methods> + <include name="getServiceToscaModelCheckInState"/> + <include name="getRsourceToscaModelCertifyState"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"> + <methods> + <include name="getResourceAssetBySpecifiedCategory"/> + <include name="getServiceAssetBySpecifiedCategory"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"> + <methods> + <include name="getResourceAssetMetadataSuccess"/> + <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/> + </methods> + </class> + <class name="org.openecomp.sdc.externalApis.AssetLifeCycle"> + <methods> + <include name="theFlow"/> + </methods> + </class> + </classes> + </test> <!-- Test --> +</suite> <!-- Suite -->
\ No newline at end of file diff --git a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml index d32839bdb7..6440dc147b 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml @@ -1,6 +1,6 @@ <?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"> +<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="10"> <test name="ExternalApis"> <classes> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onap.xml b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml index 4aad3681c9..707500a54c 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/onap.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml @@ -7,17 +7,6 @@ <classes> <class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/> - -<!-- <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/> - <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/> --> - - </classes> </test> </suite>
\ No newline at end of file |