From 2136b61fb32af1ab519334bba54056faf450bb5b Mon Sep 17 00:00:00 2001 From: xg353y Date: Tue, 14 Feb 2017 11:44:27 +0100 Subject: Update SoapUI tests for APIH Infra Adding more failure test cases in the APIH Infra SoapUI file. Update the necessarily file to expose arquillian mariadb port and download mariadb driver so that it could be used in SoapUI test cases. Change-Id: I9c3028128530878b432b521aebd0993f1c9e7dd5 Signed-off-by: xg353y --- packages/arquillian-unit-tests/pom.xml | 82 +++---- .../SoapUI/Local-API-Handler-soapui-project.xml | 238 +++++++++++++++++---- .../src/test/resources/arquillian.xml | 10 +- 3 files changed, 242 insertions(+), 88 deletions(-) diff --git a/packages/arquillian-unit-tests/pom.xml b/packages/arquillian-unit-tests/pom.xml index 7468f45f63..7302d0d058 100644 --- a/packages/arquillian-unit-tests/pom.xml +++ b/packages/arquillian-unit-tests/pom.xml @@ -12,7 +12,7 @@ arquillian-unit-tests jar - + default-tests @@ -25,10 +25,10 @@ ${project.version} - + - - + + @@ -38,19 +38,19 @@ import pom - + org.jboss.spec jboss-javaee-6.0 3.0.2.Final pom import - + - + - - + + @@ -82,28 +82,28 @@ 7.2.0.Final test --> - + org.wildfly.arquillian wildfly-arquillian-container-remote 1.1.0.Final test - + org.jboss.remoting jboss-remoting 4.0.9.Final test - + org.jboss.logging jboss-logging 3.2.1.Final test - + org.jboss.arquillian.protocol arquillian-protocol-servlet @@ -117,8 +117,8 @@ runtime pom - - + + org.arquillian.cube arquillian-cube-openshift-parent @@ -132,14 +132,14 @@ 1.0.0.Alpha15 test - + - + @@ -193,7 +193,7 @@ - + commons-codec commons-codec @@ -201,26 +201,26 @@ jar test - + org.seleniumhq.selenium selenium-java - 2.45.0 - test - + 2.45.0 + test + org.seleniumhq.selenium selenium-firefox-driver 2.45.0 test - + org.seleniumhq.selenium selenium-server - 2.45.0 - test + 2.45.0 + test - + org.apache.httpcomponents httpclient @@ -229,7 +229,7 @@ org.apache.httpcomponents httpcore - + org.openecomp.mso asdc-controller @@ -237,7 +237,7 @@ test classes - + - + org.mockito mockito-all 1.10.19 test - + org.openecomp.sdc sdc-distribution-client 0.9.0 test - + org.openecomp.mso mso-catalog-db @@ -271,7 +271,7 @@ org.apache.jmeter ApacheJMeter_core 2.13 - + test @@ -284,12 +284,12 @@ - + org.apache.jmeter ApacheJMeter_http 2.13 - + test @@ -302,12 +302,12 @@ - + org.apache.jmeter ApacheJMeter_jdbc 2.13 - + test @@ -320,7 +320,7 @@ - + @@ -347,12 +347,12 @@ project.properties['docker.host.truncated']="127.0.0.1"; project.properties['docker.host']="unix:///var/run/docker.sock" } - + if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) { project.properties['mso.version']="latest"; } else { project.properties['mso.version']=project.properties['mso.project.version']; - } + } @@ -372,9 +372,9 @@ - + - + ${container-to-start} ${project.build.directory} ${docker.host} diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml index b786090fa0..80ac36c8af 100755 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Local-API-Handler-soapui-project.xml @@ -402,7 +402,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" da9e0bdf-7d88-4111-bcad-8b72e3a5e601 -]]>${#Project#user-csi}${#Project#user-csi}BasicBasicGlobal HTTP Settingstext/html;charset=utf-8404 405html*/*200v1:volume-requestshttp://localhost:8080No AuthorizationtenantIdvnf-typeapplication/jsonapplication/json400 409v2:Faultapplication/json202v2:Response0datatext/html;charset=UTF-8401html0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}{ +]]>${#Project#user-csi}${#Project#user-csi}BasicBasicGlobal HTTP Settingstext/html;charset=utf-8404 405html*/*200v1:volume-requestshttp://localhost:8080No AuthorizationtenantIdvnf-typeapplication/jsonapplication/json400 409v2:Faultapplication/json202v2:Response0datatext/html;charset=UTF-8401html0data0data0data0data0data0data0data0data0data0data0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "service", @@ -768,7 +768,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } } -${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400vnfs:Faultapplication/jsonapplication/json202vnfs:Responsetext/html;charset=UTF-8401html415dataapplication/xmlv1:network-request<xml-fragment/>http://${#Project#host}{ +${#Project#user-infraportal}${#Project#user-infraportal}BasicBasicGlobal HTTP SettingsserviceInstanceIdvnfInstanceIdvolumeGroupInstanceIdserviceInstanceIdserviceInstanceIdTEMPLATEserviceInstanceIdapplication/json502 400 404vnfs:Faultapplication/jsonapplication/json202vnfs:Responsetext/html;charset=UTF-8401html415dataapplication/xmlv1:network-request0data<xml-fragment/>http://${#Project#host}{ "requestDetails": { "modelInfo": { "modelType": "vnf", @@ -1320,7 +1320,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ${#TestCase#serviceInstanceId} -]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0"},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}]}},"instanceReferences":{"serviceInstanceId":"falsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null},"requestStatus":{"requestState":"COMPLETE","statusMessage":"falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a204${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { +]]>200No Authorization<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a200"requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelType":"service","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"dns-servicetest","modelVersion":"1.0"},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DNS_TEST","suppressRollback":true},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"subscriber-1","subscriberName":"testSubscriber"},"cloudConfiguration":null,"requestParameters":{"subscriptionServiceType":"MOG","userParams":[{"name":"someUserParam","value":"someValue"}]}},"instanceReferences":{"serviceInstanceId":"falsefalse"serviceInstanceName":"DNS_TEST","vnfInstanceId":null,"vnfInstanceName":null,"vfModuleInstanceId":null,"vfModuleInstanceName":null,"volumeGroupInstanceId":null,"volumeGroupInstanceName":null,"networkInstanceId":null,"networkInstanceName":null},"requestStatus":{"requestState":falsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}http://localhost/ecomp/mso/infra/orchestrationRequests/v2/7d28d657-cdad-44eb-b048-7b0bc68b795a204${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#host}{"requestDetails": { "modelInfo": { "modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", "modelName": "DNSResource", @@ -1341,7 +1341,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -1381,7 +1381,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}, {"relatedInstance": { "modelInfo": { @@ -1392,7 +1392,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "8c8224b6-ef17-44e1-948b-5783ed0f06d6" + "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" }} ], "requestInfo": { @@ -1435,7 +1435,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}, {"relatedInstance": { "modelInfo": { @@ -1446,7 +1446,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "b978e03a-8371-496f-b53a-fa117f24c1d0" + "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" }} ], "requestInfo": { @@ -1563,7 +1563,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}, {"relatedInstance": { "modelInfo": { @@ -1574,7 +1574,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "b978e03a-8371-496f-b53a-fa117f24c1d0" + "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" }} ], "requestInfo": { @@ -1616,7 +1616,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}, {"relatedInstance": { "modelInfo": { @@ -1627,7 +1627,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelCustomizationName": "DNSResource-1", "modelInvariantId": "585822c7-4027-4f84-ba50-e9248606f112" }, - "instanceId": "b978e03a-8371-496f-b53a-fa117f24c1d0" + "instanceId": "1ac28783-8268-41b0-a653-36d0d09d0695" }} ], "requestInfo": { @@ -1684,7 +1684,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -1719,7 +1719,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" "modelVersion": "1.0", "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "instanceId": "90b3a5f7-f7fa-4ac1-b966-becf2ae480cd" + "instanceId": "abda8f01-08fc-4d4f-8e57-9eaab06e33e4" }}], "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -1870,7 +1870,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } } }http://localhost/ecomp/mso/infra/serviceInstances/v2202 -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingstransfer-to-create-vnf-urlResponseCreate Service$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHJSONPATHtruetransfer-to-create-vfmodule-urlResponseCreate Service$.requestReferences.requestIdrequestId#TestCase#JSONPATHJSONPATHtrueMsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter +${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsset-serviceInstanceId-propertyResponseCreate Service 2$.requestReferences.instanceIdserviceInstanceId#TestCase#JSONPATHXQUERYtrueset-requestId-propertyResponseCreate Service 2$.requestReferences.requestIdrequestId#TestCase#JSONPATHXQUERYtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with wrong BPMN script URL$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtruetransfer-to-create-network-urlResponseCreate Service 2$.requestReferences.instanceIdRequestCreate Networks with no BPMN script$.requestDetails.relatedInstanceList[0].relatedInstance.instanceIdJSONPATHJSONPATHtrue5000MsoRequestsDbAdapterImplPortBindingupdateInfraRequest<xml-fragment/>UTF-8http://${#Project#host}/dbadapters/RequestsDbAdapter @@ -1910,34 +1910,188 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" } }http://localhost/ecomp/mso/infra/serviceInstances/v2409 -Error: Locked instancefalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settingsorg.mysql.jdbc.Driverjdbc:mysql://172.17.0.2:3306/mso_catalog?user=catalog&password=catalog123delete from service where id=1;<UpdateCount>1</UpdateCount>falsefalse<xml-fragment/>http://${#Project#host}{ - "requestDetails": { - "modelInfo": { +Error: Locked instancefalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { + "cloudConfiguration": { + "tenantId": "cff319d50266491fa744b0d493a51ce0", + "lcpCloudRegionId": "rdm3" + }, + "modelInfo": { + "modelName": "CONTRAIL30_BASIC", + "modelType": "network" + }, + "relatedInstanceList": [{"relatedInstance": { + "modelInfo": { + "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", + "modelName": "dns-servicetest", "modelType": "service", - "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", - "modelName": "dns-service", "modelVersion": "1.0", - "Action": "updateInstance" - }, - "subscriberInfo": { - "globalSubscriberId": "subscriber-1", - "subscriberName": "testSubscriber" + "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "requestInfo": { - "instanceName": "DNS_TEST", - "source": "VID", - "suppressRollback": true + "instanceId": "f75b1c7d-e878-40a3-8877-bc5605615f4d" + }}], + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1" + }, + "requestParameters": {} +}}http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks502Failed calling bpmnfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#host}{"requestDetails": { + "cloudConfiguration": { + "tenantId": "cff319d50266491fa744b0d493a51ce0", + "lcpCloudRegionId": "rdm3" + }, + "modelInfo": { + "modelName": "CONTRAIL30_BASIC", + "modelType": "network" + }, + "relatedInstanceList": [{"relatedInstance": { + "modelInfo": { + "modelNameVersionId": "1e34774e-715e-4fd6-bd09-7b654622f35i", + "modelName": "dns-servicetest", + "modelType": "service", + "modelVersion": "1.0", + "modelInvariantId": "585822c8-4027-4f84-ba50-e9248606f111" }, - "requestParameters": { - "subscriptionServiceType": "MOG", - "userParams": [ - { - "name": "someUserParam", - "value": "someValue" - } - ] - } - } -}http://localhost/ecomp/mso/infra/serviceInstances/v2202 -${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsrequestId7a6e22c6-0f96-4ad8-b696-123e70cc5a67serviceInstanceId90b3a5f7-f7fa-4ac1-b966-becf2ae480cdvnfInstanceIdb978e03a-8371-496f-b53a-fa117f24c1d0vfModuleInstanceIda26eaaaa-bce4-4ec0-98f3-f21e43969aabvomuleGroupInstanceIdf4bd7c69-a525-429a-8c1b-384f1beacd90networkIdebdd074d-ba30-4d44-921c-323cec4e78fchostlocalhost:8080user-infraportalInfraPortalClientpassword-infraportalpassword1$DBhostmariadb \ No newline at end of file + "instanceId": "f75b1c7d-e878-40a3-8877-bc5605615f4d" + }}], + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "instanceName": "MNS-25180-L-06Private_tst_mns_mgmt_net_1" + }, + "requestParameters": {} +}}http://localhost/ecomp/mso/infra/serviceInstances/v2/serviceInstanceId/networks404Recipe does not exist in catalog DBfalsefalse${#Project#user-infraportal}${#Project#password-infraportal}BasicBasicGlobal HTTP SettingsrequestId76c15633-b6f2-4281-9ba2-73b516734c04serviceInstanceIdf75b1c7d-e878-40a3-8877-bc5605615f4dvnfInstanceId1ac28783-8268-41b0-a653-36d0d09d0695vfModuleInstanceId38b74487-c406-47d7-a9eb-530dd89242ccvomuleGroupInstanceId20e3e2f9-25a3-494e-8108-cafa3ff992f1networkIdebdd074d-ba30-4d44-921c-323cec4e78fchostlocalhost:8080user-infraportalInfraPortalClientpassword-infraportalpassword1$db-driver \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml index ea07bc5a42..7606450809 100644 --- a/packages/arquillian-unit-tests/src/test/resources/arquillian.xml +++ b/packages/arquillian-unit-tests/src/test/resources/arquillian.xml @@ -13,8 +13,8 @@ 1.23 - - ${docker.url} + + ${docker.url} CUBE mso: @@ -58,7 +58,7 @@ image: mariadb:10.1.11 beforeStop: - log: - to: ${target.folder}/mso-automated-tests/db/mariadb.log + to: ${target.folder}/mso-automated-tests/db/mariadb.log follow: false stdout: true stderr: true @@ -76,14 +76,14 @@ binds: - ${target.folder}/test-classes/docker/mariadb/conf1:/etc/mysql/conf.d:ro - ${target.folder}/../../root-pack-extras/config-resources/mariadb:/docker-entrypoint-initdb.d:ro - + false true true mso - + -- cgit 1.2.3-korg