From 58cbfa63f239b22e8feb1440919b5fc2cf0118ce Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Mon, 18 Feb 2019 10:41:17 +0100 Subject: Increasing test coverage for vid.mso Change-Id: I71d44c6b36babcc5b8931cda65ab86940062deda Issue-ID: VID-387 Signed-off-by: Bartosz Gardziejewski --- .../test/resources/WEB-INF/conf/system.properties | 9 ++ .../manual_tasks_by_requestId_test.json | 29 ++++++ .../manual_tasks_by_requestId_wrongJson_test.json | 29 ++++++ .../mso_model_info_sample_wrong_response.json | 108 +++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_test.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_wrongJson_test.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/mso_model_info_sample_wrong_response.json (limited to 'vid-app-common/src/test/resources') diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index 268666798..6f19eb31e 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -136,6 +136,7 @@ guard_notebook_url=https://rcloud.research.att.com/mini.html?notebook=a06a9cf142 #dev #mso.server.url=http://mtanjv9moah10-eth0.aic.cip.att.com:8080/ecomp/mso/infra #istScrum-Master +mso.restapi.svc.e2einstance=/e2eServiceInstances/v3 mso.client.type=LOCAL mso.server.url=http://vm1.mso.simpledemo.openecomp.org:8080 mso.polling.interval.msecs=10000 @@ -157,6 +158,14 @@ mso.restapi.get.man.tasks=/tasks/v1 mso.restapi.configurations=/serviceInstances/v6//configurations mso.restapi.configuration.instance=${mso.restapi.configurations} +mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate +mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/ +mso.restapi.cloudResourcesApiRoot=/cloudResources/v1 +mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1 +mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId= +mso.restapi.operationalEnvironment.deactivate=${mso.restapi.operationalEnvironment}/deactivate +mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments + mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign diff --git a/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_test.json b/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_test.json new file mode 100644 index 000000000..f4ba58d54 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_test.json @@ -0,0 +1,29 @@ +{ + "taskList":[{ + "taskId":"123123abc", + "type":"testTask", + "nfRole":"testTask", + "subscriptionServiceType":"testTask", + "originalRequestId":"testTask", + "originalRequestorId":"testTask", + "errorSource":"testTask", + "errorCode":"testTask", + "errorMessage":"testTask", + "buildingBlockName":"testTask", + "buildingBlockStep":"testTask", + "validResponses":null + },{ + "taskId":"321321abc", + "type":"testTask", + "nfRole":"testTask", + "subscriptionServiceType":"testTask", + "originalRequestId":"testTask", + "originalRequestorId":"testTask", + "errorSource":"testTask", + "errorCode":"testTask", + "errorMessage":"testTask", + "buildingBlockName":"testTask", + "buildingBlockStep":"testTask", + "validResponses":null + }] +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_wrongJson_test.json b/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_wrongJson_test.json new file mode 100644 index 000000000..624d3d24f --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/manual_tasks_by_requestId_wrongJson_test.json @@ -0,0 +1,29 @@ +{ + "taskList":[{ + "task":"123123abc", + "type":"testTask", + "nfRole":"testTask", + "subscriptionServiceType":"testTask", + "originalRequestId":"testTask", + "originalRequestorId":"testTask", + "errorSource":"testTask", + "errorCode":"testTask", + "errorMessage":"testTask", + "buildingBlockName":"testTask", + "buildingBlockStep":"testTask", + "validResponses":null + },{ + "task":"321321abc", + "type":"testTask", + "nfRole":"testTask", + "subscriptionServiceType":"testTask", + "originalRequestId":"testTask", + "originalRequestorId":"testTask", + "errorSource":"testTask", + "errorCode":"testTask", + "errorMessage":"testTask", + "buildingBlockName":"testTask", + "buildingBlockStep":"testTask", + "validResponses":null + }] +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_model_info_sample_wrong_response.json b/vid-app-common/src/test/resources/payload_jsons/mso_model_info_sample_wrong_response.json new file mode 100644 index 000000000..c74979d0d --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/mso_model_info_sample_wrong_response.json @@ -0,0 +1,108 @@ + + "requestList": + { + "request": { + "requestId": "f8c813a2-b22b-4e3d-9be0-8e2d16b1add3", + "startTime": "Wed, 03 Oct 2018 13:13:04 GMT", + "requestScope": "vnf", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "ws-sp 0", + "modelInvariantId": "734f0952-6678-44e7-8918-f9aa4694b687", + "modelType": "vnf", + "modelName": "ws-sp", + "modelVersion": "1.0", + "modelCustomizationUuid": "5815868c-35f8-4c5a-b899-e6eb49f52986", + "modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367", + "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986", + "modelUuid": "0e0bb964-e687-4439-9a9e-de9cd1ff5367", + "modelInvariantUuid": "734f0952-6678-44e7-8918-f9aa4694b687", + "modelInstanceName": "ws-sp 0" + }, + "requestInfo": { + "productFamilyId": "61cc3239-5c2e-4762-a281-7422a2e54d5a", + "source": "VID", + "instanceName": "ws-test-0310-8", + "suppressRollback": false, + "requestorId": "demo" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "fd84f066-ea75-4b23-acd0-3cf3fce7a99b", + "modelInfo": { + "modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b", + "modelType": "service", + "modelName": "ws-service", + "modelVersion": "1.0", + "modelVersionId": "cd3fbd06-6bc8-43a4-b803-933fc2e3cdf7", + "modelUuid": "cd3fbd06-6bc8-43a4-b803-933fc2e3cdf7", + "modelInvariantUuid": "c9817f08-07b2-458b-a02f-cd5407ee7a7b" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e", + "lcpCloudRegionId": "RegionOne" + }, + "requestParameters": { + "testApi": "VNF_API" + }, + "platform": { + "platformName": "Demo" + }, + "lineOfBusiness": { + "lineOfBusinessName": "Demo" + } + }, + "instanceReferences": { + "serviceInstanceId": "fd84f066-ea75-4b23-acd0-3cf3fce7a99b", + "vnfInstanceId": "980fe98e-47f8-4164-862d-4ebb026cec75", + "vnfInstanceName": "ws-test-0310-8", + "requestorId": "demo" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "Vnf has been created successfully.", + "percentProgress": 100, + "finishTime": "Wed, 03 Oct 2018 13:13:09 GMT" + } + } + }, + { + "request": { + "requestId": "3447ba35-015d-4d72-9345-d89b1e35b2d6", + "startTime": "Thu, 04 Oct 2018 10:35:17 GMT", + "requestScope": "vnf", + "requestType": "inPlaceSoftwareUpdate", + "requestDetails": { + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "demo" + }, + "cloudConfiguration": { + "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e", + "lcpCloudRegionId": "RegionOne" + }, + "requestParameters": { + "payload": "{\"existing_software_version\":\"0.7\",\"new_software_version\":\"1.0\",\"operations_timeout\":\"10\"}" + } + }, + "instanceReferences": { + "serviceInstanceId": "fd84f066-ea75-4b23-acd0-3cf3fce7a99b", + "vnfInstanceId": "980fe98e-47f8-4164-862d-4ebb026cec75", + "requestorId": "demo" + }, + "requestStatus": { + "requestState": "FAILED", + "statusMessage": "Cloud Region with cloudRegionId RegionOne does not exist in A&AI", + "percentProgress": 100, + "finishTime": "Thu, 04 Oct 2018 10:35:21 GMT" + } + } + } + ] +} \ No newline at end of file -- cgit 1.2.3-korg