diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-07-30 15:56:09 -0400 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-07-31 11:09:25 -0400 |
| commit | 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 (patch) | |
| tree | 59a968f27b4b603aacc9d5e7b51fb598aeec5321 /mso-api-handlers/mso-api-handler-infra/src/test/resources | |
| parent | b6dc38501f3b746426b42d9de4cc883d894149e8 (diff) | |
Containerization feature of SO
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/test/resources')
280 files changed, 13086 insertions, 6381 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json deleted file mode 100644 index bf43fa39a6..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{
- "requestDetails": {
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/CompareModelRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/CompareModelRequest.json new file mode 100644 index 0000000000..02a5bf71c5 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/CompareModelRequest.json @@ -0,0 +1,6 @@ +{ + "globalSubscriberId": "60c3e96e-0970-4871-b6e0-3b6de7561519", + "serviceType": "vnf", + "modelInvariantIdTarget": "60c3e96e-0970-4871-b6e0-3b6de1234567", + "modelVersionIdTarget": "modelVersionIdTarget" +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/DeleteRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/DeleteRequest.json new file mode 100644 index 0000000000..6626200eaf --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/DeleteRequest.json @@ -0,0 +1,4 @@ +{ + "globalSubscriberId":"299392392", + "serviceType":"VoLTE" +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/Request.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/Request.json new file mode 100644 index 0000000000..c5114970b1 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/Request.json @@ -0,0 +1,81 @@ +{ + "service":{ + "name":"so_test4", + "description":"so_test2", + "serviceInvariantUuid":"60c3e96e-0970-4871-b6e0-3b6de7561519", + "serviceUuid":"592f9437-a9c0-4303-b9f6-c445bb7e9814", + "globalSubscriberId":"123457", + "serviceType":"voLTE", + "parameters":{ + "resources":[ + { + "resourceName":"vIMS", + "resourceInvariantUuid":"60c3e96e-0970-4871-b6e0-3b6de7561516", + "resourceUuid":"60c3e96e-0970-4871-b6e0-3b6de7561512", + "parameters":{ + "locationConstraints":[ + { + "vnfProfileId":"zte-vBAS-1.0", + "locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad0" + } + }, + { + "vnfProfileId":"zte-vMME-1.0", + "locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad0" + } + } + ] + } + }, + { + "resourceName":"vEPC", + "resourceInvariantUuid":"61c3e96e-0970-4871-b6e0-3b6de7561516", + "resourceUuid":"62c3e96e-0970-4871-b6e0-3b6de7561512", + "parameters":{ + "locationConstraints":[ + { + "vnfProfileId":"zte-CSCF-1.0", + "locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad1" + } + } + ] + } + }, + { + "resourceName":"underlayvpn", + "resourceInvariantUuid":"60c3e96e-0970-4871-b6e0-3b6de7561513", + "resourceUuid":"60c3e96e-0970-4871-b6e0-3b6de7561514", + "parameters":{ + "locationConstraints":[ + + ] + } + }, + { + "resourceName":"overlayvpn", + "resourceInvariantUuid":"60c3e96e-0970-4871-b6e0-3b6de7561517", + "resourceUuid":"60c3e96e-0970-4871-b6e0-3b6de7561518", + "parameters":{ + "locationConstraints":[ + + ] + } + } + ], + "requestInputs":{ + "externalDataNetworkName":"Flow_out_net", + "m6000_mng_ip":"181.18.20.2", + "externalCompanyFtpDataNetworkName":"Flow_out_net", + "externalPluginManageNetworkName":"plugin_net_2014", + "externalManageNetworkName":"mng_net_2017", + "sfc_data_network":"sfc_data_net_2016", + "NatIpRange":"210.1.1.10-210.1.1.20", + "location":"4050083f-465f-4838-af1e-47a545222ad0", + "sdncontroller":"9b9f02c0-298b-458a-bc9c-be3692e4f35e" + } + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/ScaleRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/ScaleRequest.json new file mode 100644 index 0000000000..2f1e84559c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/E2EServiceInstancesTest/ScaleRequest.json @@ -0,0 +1,18 @@ +{ + "service":{ + "serviceType":"example-service-type", + "globalSubscriberId":"test_custormer", + "resources":[{ + "resourceInstanceId":"ns111", + "scaleType":"SCALE_NS", + "scaleNsData":{ + "scaleNsByStepsData":{ + "numberOfSteps":"4", + "aspectId":"TIC_EDGE_HW", + "scalingDirection":"UP" + } + } + }], + "serviceInstanceName":"XXXX" + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InfraActiveRequestsReset.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InfraActiveRequestsReset.sql new file mode 100644 index 0000000000..a5d38e6478 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InfraActiveRequestsReset.sql @@ -0,0 +1,15 @@ +INSERT INTO requestdb.infra_active_requests(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES +('00032ab7-3fb3-42e5-965d-8ea592502017', '00032ab7-3fb3-42e5-965d-8ea592502016', 'deleteInstance', 'COMPLETE', 'Vf Module has been deleted successfully.', '100', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null), +('00032ab7-na18-42e5-965d-8ea592502018', '00032ab7-fake-42e5-965d-8ea592502018', 'deleteInstance', 'PENDING', 'Vf Module deletion pending.', '0', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"requestDetails": {"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null), +('00093944-bf16-4373-ab9a-3adfe730ff2d', null, 'createInstance', 'FAILED', 'Error: Locked instance - This service (MSODEV_1707_SI_v10_011-4) already has a request being worked with a status of IN_PROGRESS (RequestId - 278e83b1-4f9f-450e-9e7d-3700a6ed22f4). The existing request must finish or be cleaned up before proceeding.', '100', '2017-07-11 18:33:26', '2017-07-11 18:33:26', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelInvariantId":"9647dfc4-2083-11e7-93ae-92361f002671","modelType":"service","modelName":"Infra_v10_Service","modelVersion":"1.0","modelVersionId":"5df8b6de-2083-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","instanceName":"MSODEV_1707_SI_v10_011-4","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true}}', null, 'APIH', null, null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'service', 'createInstance', null, 'MSODEV_1707_SI_v10_011-4', 'xxxxxx', null, null, null, null), +('001619d2-a297-4a4b-a9f5-e2823c88458f', '001619d2-a297-4a4b-a9f5-e2823c88458f', 'CREATE_VF_MODULE', 'COMPLETE', 'COMPLETED', '100', '2016-07-01 14:11:42', '2017-05-02 16:03:34', 'PORTAL', null, 'test-vscp', 'elena_test21', null, null, '381b9ff6c75e4625b7a4182f90fc68d3', null, null, null, '{"requestDetails": {"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}}', 'NONE', 'RDBTEST', '2016-07-01 14:11:42', 'VNF', null, null, null, 'MODULENAME1', 'moduleModelName', 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb', 'mtn9', null, null, null, null, null, 'vfModule', 'createInstance', null, null, null, null, null, null, null), +('5ffbabd6-b793-4377-a1ab-082670fbc7ac', '5ffbabd6-b793-4377-a1ab-082670fbc7ac', 'deleteInstance', 'PENDING', 'Vf Module deletion pending.', '0', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"requestDetails": {"modelInfo": {"modelType": "vfModule","modelName": "test::base::module-0","modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671","modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671","modelVersion": "2","modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671"},"cloudConfiguration": {"lcpCloudRegionId": "n6","tenantId": "0422ffb57ba042c0800a29dc85ca70f8"},"requestInfo": {"instanceName": "MSO-DEV-VF-1806BB-v10-base-it2-1","source": "VID","suppressRollback": false,"requestorId": "xxxxxx"},"relatedInstanceList": [{"relatedInstance": {"instanceId": "76fa8849-4c98-473f-b431-2590b192a653","modelInfo": {"modelType": "service","modelName": "Infra_v10_Service","modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671","modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671","modelVersion": "1.0"}}},{"relatedInstance": {"instanceId": "d57970e1-5075-48a5-ac5e-75f2d6e10f4c","modelInfo": {"modelType": "vnf","modelName": "v10","modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671","modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671","modelVersion": "1.0","modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671","modelCustomizationName": "v10 1"}}}],"requestParameters": {"usePreload": true,"userParams": []}}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null); +INSERT INTO requestdb.infra_active_requests(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES +('00164b9e-784d-48a8-8973-bbad6ef818ed', null, 'createInstance', 'COMPLETE', 'Service Instance was created successfully.', '100', '2017-09-28 12:45:51', '2017-09-28 12:45:53', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f","modelType":"service","modelNameVersionId":null,"modelName":"MSO Test Network","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DEV-n6-3100-0927-1","suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"aicNodeClli":null,"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'CreateGenericALaCarteServiceInstance', '2017-09-28 12:45:52', null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'service', 'createInstance', 'b2f59173-b7e5-4e0f-8440-232fd601b865', 'DEV-n6-3100-0927-1', 'xxxxxx', null, null, null, null), +('00173cc9-5ce2-4673-a810-f87fefb2829e', null, 'createInstance', 'FAILED', 'Error parsing request. No valid instanceName is specified', '100', '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', null, null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, '{"modelInfo":{"modelInvariantId":"ff6163d4-7214-459e-9f76-507b4eb00f51","modelType":"service","modelName":"ConstraintsSrvcVID","modelVersion":"2.0","modelVersionId":"722d256c-a374-4fba-a14f-a59b76bb7656"},"requestInfo":{"productFamilyId":"LRSI-OSPF","source":"VID","requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"cloudConfiguration":{"tenantId":"a259ae7b7c3f493cb3d91f95a7c18149","lcpCloudRegionId":"mtn16"},"requestParameters":{"subscriptionServiceType":"Mobility","userParams":[{"name":"neutronport6_name","value":"8"},{"name":"neutronnet5_network_name","value":"8"},{"name":"contrailv2vlansubinterface3_name","value":"false"}]}}', null, 'APIH', null, null, null, null, null, null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', null, null, null, null, null, null, null), +('0017f68c-eb2d-45bb-b7c7-ec31b37dc349', null, 'activateInstance', 'UNLOCKED', null, '20', '2017-09-26 16:09:29', null, 'VID', null, null, null, null, null, null, null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"1587cf0e-f12f-478d-8530-5c55ac578c39","modelType":"configuration","modelNameVersionId":null,"modelName":null,"modelVersion":null,"modelCustomizationUuid":null,"modelVersionId":"36a3a8ea-49a6-4ac8-b06c-89a545444455","modelCustomizationId":"68dc9a92-214c-11e7-93ae-92361f002671","modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":null,"suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"9e15a443-af65-4f05-9000-47ae495e937d","modelInfo":{"modelCustomizationName":null,"modelInvariantId":"de19ae10-9a25-11e7-abc4-cec278b6b50a","modelType":"service","modelNameVersionId":null,"modelName":"Infra_Configuration_Service","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"ee938612-9a25-11e7-abc4-cec278b6b50a","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"instanceDirection":null}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":null,"lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'APIH', '2017-09-26 16:09:29', null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'configuration', 'activateInstance', '9e15a443-af65-4f05-9000-47ae495e937d', null, 'xxxxxx', '26ef7f15-57bb-48df-8170-e59edc26234c', null, null, null),('0017f68c-eb2d-45bb-b7c7-ec31b37dc350', null, 'createInstance', 'IN_PROGRESS', 'Error parsing request. + No valid instanceName is specified', null, '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', + '1882938', null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, + '{"serviceInstanceId":"1882939","vnfInstanceId":"1882938","networkInstanceId":"1882937","volumeGroupInstanceId":"1882935","vfModuleInstanceId":"1882934","requestDetails":{"requestInfo":{"source":"VID","requestorId":"xxxxxx","instanceName":"testService9"},"requestParameters":{"aLaCarte":true,"autoBuildVfModules":false,"subscriptionServiceType":"test"},"modelInfo":{"modelInvariantId":"f7ce78bb-423b-11e7-93f8-0050569a7965","modelVersion":"1","modelVersionId":"10","modelType":"service","modelName":"serviceModel","modelInstanceName":"modelInstanceName","modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"}}}', + null, 'APIH', null, null, '1882935', null, '1882934', null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', '1882939', 'testService10', 'xxxxxx', 'test', null, null, null); +COMMIT;
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json deleted file mode 100644 index f5457b186b..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json +++ /dev/null @@ -1,38 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": true,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json deleted file mode 100644 index e290764b30..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json +++ /dev/null @@ -1,43 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "test",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json deleted file mode 100644 index 3cbcafaef8..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json +++ /dev/null @@ -1,43 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/CloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfiguration.json index 96316d8947..37c8b2e8bb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/CloudConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfiguration.json @@ -1,39 +1,39 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesTrue.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationConfig.json index aeb4375c9b..9d1e1f5ae8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesTrue.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationConfig.json @@ -1,43 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyInstanceName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationNetwork.json index ad8140c95d..ae3b8b5bb3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyInstanceName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationNetwork.json @@ -1,43 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesFalse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationVnf.json index ad8140c95d..c35cd4f977 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesFalse.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/CloudConfigurationVnf.json @@ -1,43 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/DeactivateAndCloudDeleteCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/DeactivateAndCloudDeleteCloudConfiguration.json new file mode 100644 index 0000000000..47b2e309d3 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/DeactivateAndCloudDeleteCloudConfiguration.json @@ -0,0 +1,11 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyCloudConfiguration.json index cac9cd7941..66cf436d2d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyCloudConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyCloudConfiguration.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLcpCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyLcpCloudConfiguration.json index 324f545e55..d6bd660c57 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLcpCloudConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyLcpCloudConfiguration.json @@ -1,41 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "suppressRollback": false, + "source": "VID" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyTenantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyTenantId.json index 492bc10eb5..c010a45d40 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyTenantId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/EmptyTenantId.json @@ -1,41 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "suppressRollback": false, + "source": "VID" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateCloudConfiguration.json index f86b66edf1..18b785cae5 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateCloudConfiguration.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudRegionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateCloudRegionId.json index bb76d74aba..bd114f7ad8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudRegionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateCloudRegionId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateTenantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateTenantId.json index da3ba3f5da..686faf15c0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateTenantId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/CloudConfiguration/InPlaceSoftwareUpdateTenantId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ConfigurationModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ConfigurationModelVersionId.json index 9a15751db6..6506a33dc7 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ConfigurationModelVersionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ConfigurationModelVersionId.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "configuration",
- "modelVersion": "2.0",
- "modelVersionId": ""
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersion": "2.0", + "modelVersionId": "" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/InvalidModelInvariantId.json index 7a7708e3a5..9bee294b0e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidModelInvariantId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/InvalidModelInvariantId.json @@ -1,43 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "test*",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "test*", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "instanceName": "test", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomization.json index b3f5ee904a..9a983609aa 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomization.json @@ -1,39 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelCustomizationName":"", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "autoBuildVfModules": false, + "usePreload": false, + "cascadeDelete": false, + "rebuildVolumeGroups": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationId.json index 37dd5b0bf7..8b327fbb9b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationId.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vfModule", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdUsingPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationIdUsingPreload.json index 471f980778..5d1b6b4747 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdUsingPreload.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationIdUsingPreload.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelCustomizationName": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "usePreload": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelCustomizationName": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "usePreload": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationName.json index 7665d1d9a9..74dc205d1e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdTest.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationName.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": ""
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInfoNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInfoNull.json index e8a2f857fc..bbc8b7f9ef 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInfoNull.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInfoNull.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName" : "testV2aLaCarteFlag",
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName" : "testV2aLaCarteFlag", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantId.json index c8b6741f76..b974f3c9d6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "configuration",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfiguration.json index b068614943..d42cc7e456 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfiguration.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "configuration",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfigurationDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfigurationDelete.json index b068614943..d42cc7e456 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfigurationDelete.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfigurationDelete.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "configuration",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdService.json index 309222f3b8..edaf25bc3a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdService.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdVnf.json index d5dab07852..a7076c34dd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdVnf.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdVnf.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelNameVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelNameVersionId.json index 931ac31503..7b46671afe 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelNameVersionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelNameVersionId.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelTypeNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelTypeNull.json index e4d16cd132..6203060537 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelTypeNull.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelTypeNull.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionId.json index d02de4cfdd..35300c221f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionId.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": ""
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionIdCreate.json index b6b845735f..2a57dc9306 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdCreate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionIdCreate.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": ""
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionNetwork.json index 56396eac23..06eb779a84 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionNetwork.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionNetwork.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "network",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "network", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionService.json index bfe4c14375..767dc4f78c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionService.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdServiceCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionServiceCreate.json index 1628057fa0..f0eef84b95 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdServiceCreate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionServiceCreate.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionVfModule.json index d669769c24..94ef050cfb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionVfModule.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionVfModule.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vfModule",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vfModule", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnActivate.json index 06605ed840..7c33e25145 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnActivate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnActivate.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelType": "service", + "modelVersion": "2.0", + "modelCustomizationName":"", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnDelete.json index 06605ed840..7c33e25145 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnDelete.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnDelete.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelType": "service", + "modelVersion": "2.0", + "modelCustomizationName":"", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationId.json index 90abd6444c..bca68504cb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationId.json @@ -1,66 +1,66 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "test",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- }
- }
- }
- ],
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "test", + "modelType": "vfModule", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + } + } + } + ], + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationIdService.json index 7b9a1badb8..06ea217607 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationIdService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationIdService.json @@ -1,66 +1,66 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "test",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- }
- }
- }
- ],
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "test", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + } + } + } + ], + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VfModuleModelName.json index b1c423fb73..839c58a5af 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VfModuleModelName.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "", + "modelType": "vfModule", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationId.json index 17ee433acf..3ed83a4642 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationId.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdEmpty.json index 2d11862ad9..a2d25594c0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdEmpty.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdEmpty.json @@ -1,65 +1,65 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelCustomizationName": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelCustomizationName": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdPreload.json index 221740c2ea..f6206f49ba 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdPreload.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdPreload.json @@ -1,36 +1,36 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": true,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": true, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNameNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationNameNull.json index 9f6fad164f..985ad376d8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNameNull.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationNameNull.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationTest.json index 80ff4137db..a8a4021694 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationTest.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationTest.json @@ -1,39 +1,39 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelCustomizationName": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelNameVersionId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelCustomizationName": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelNameVersionId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "usePreload": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v2ModelVersionId.json index aa3835c04b..7863e67a5d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2ModelVersionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v2ModelVersionId.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "configuration",
- "modelVersion": "2.0",
- "modelVersionId": ""
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "configuration", + "modelVersion": "2.0", + "modelVersionId": "" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3UpdateNetworkBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v3UpdateNetworkBad.json index 956d771c79..5feffd2f24 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3UpdateNetworkBad.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v3UpdateNetworkBad.json @@ -13,7 +13,7 @@ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": true, - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModuleMissingModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json index 2fd0e03ad3..c5539ac083 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModuleMissingModelCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json @@ -1,61 +1,61 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTEST103a-vSAMP12_base_module-0",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": false,
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "MSOTEST103a-vSAMP12_base_module-0", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c", + "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol", + "modelInfo": { + "modelType": "volumeGroup" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP12 1" + } + } + } + ], + "requestParameters": { + "usePreload": false, + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModuleNoCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleNoCustomizationId.json index 9c892a4fc0..1ca749f66f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModuleNoCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleNoCustomizationId.json @@ -1,61 +1,61 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTEST103a-vSAMP12_base_module-0",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": true,
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "MSOTEST103a-vSAMP12_base_module-0", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c", + "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol", + "modelInfo": { + "modelType": "volumeGroup" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP12 1" + } + } + } + ], + "requestParameters": { + "usePreload": true, + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ActivateModelVersionId.json index bbd9ac855e..9b78da9be9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorBadData.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ActivateModelVersionId.json @@ -1,34 +1,34 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
-
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfigurationBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5CreateConfigurationModelCustomizationId.json index f046932f85..2e8e0dbebc 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfigurationBad.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5CreateConfigurationModelCustomizationId.json @@ -1,64 +1,64 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "destination",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5DeactivateModelInvariantId.json index aaa3069b2c..4b80bb1e8f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorBadData.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5DeactivateModelInvariantId.json @@ -1,34 +1,34 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
-
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdDisablePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdDisablePort.json index f8f983a17e..6e1883edab 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdDisablePort.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdDisablePort.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "network",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "network", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdNetwork.json index f8f983a17e..6e1883edab 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdNetwork.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdNetwork.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelName": "SDNW Service 1710",
- "modelType": "network",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelName": "SDNW Service 1710", + "modelType": "network", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/EmptyLineOfBusiness.json index 8c8ffab1b8..1ea66106e1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLineOfBusiness.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/EmptyLineOfBusiness.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": ""
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyPlatform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/EmptyPlatformName.json index 2827475ada..7cad18d85a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyPlatform.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/EmptyPlatformName.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": ""
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/LineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/OptionalLineOfBusiness.json index 84ce00ce23..8e020e4b33 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/LineOfBusiness.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/OptionalLineOfBusiness.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Platform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/Platform.json index 85d13d032e..05112cabdc 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Platform.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/Platform.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/PlatformAndLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/PlatformAndLineOfBusiness.json index 75f38914ce..994251db6b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/PlatformAndLineOfBusiness.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/PlatformAndLineOfBusiness.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/PlatformTest.json index f63a8aa8d5..746e5a333c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformTest.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/PlatformAndLineOfBusiness/PlatformTest.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "instanceName" : "testV2aLaCarteFlag",
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "instanceName" : "testV2aLaCarteFlag", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyOwningEntityId.json index eb1c72004a..9e527324ca 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyOwningEntityId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyOwningEntityName.json index 6525364bcf..cb1782c1e2 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyOwningEntityName.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyProject.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyProjectName.json index bdef26340a..9be70d8fe7 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyProject.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/EmptyProjectName.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": ""
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Project.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/OptionalProject.json index 4f2fb9877e..1372b1fadd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Project.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/OptionalProject.json @@ -1,40 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OwningEntity.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/OwningEntity.json index 81ec46a7e5..4aee4df814 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OwningEntity.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/OwningEntity.json @@ -1,39 +1,39 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/ProjectAndOwningEntity.json index ad80a16815..bffc179793 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/ProjectAndOwningEntity.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/ServiceAssignNoOE.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/ServiceAssignNoOE.json new file mode 100644 index 0000000000..817a44d346 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ProjectAndOwningEntity/ServiceAssignNoOE.json @@ -0,0 +1,115 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "testService", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "testService", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mow.module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mowmodule-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mowmodule-2", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidInstanceName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/InvalidInstanceName.json index 69b4866fe7..836a3e2737 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidInstanceName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/InvalidInstanceName.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false,
- "instanceName" : "test*"
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName" : "test*" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstances.json index 13f6a986fb..07d23fb3a5 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstances.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstances.json @@ -1,33 +1,33 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesId.json index ee8bd91bfc..eb39deb7cb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesId.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesIdFormat.json index 7a1e1260d3..2c459a827b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesIdFormat.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesIdFormat.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "test id",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "test id", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesInstanceId.json index 75539a7533..6d13a58134 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesInstanceId.json @@ -1,47 +1,47 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelCustomizationId.json index efeb22c080..1758c73bb3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelCustomizationId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelCustomizationId.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInfo.json index 0543aa998b..36438b3687 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInfo.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInfo.json @@ -1,39 +1,39 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000"
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000" + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInvariantId.json index 06baff7c1a..601caca996 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInvariantId.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInvariantIdFormat.json index 73156d0c2b..c28717a1f7 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantIdFormat.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelInvariantIdFormat.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "a test",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "a test", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelName.json index 20c0d8395e..41ab004ce3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelName.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelType.json index ff9f5585d7..a64099effc 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelType.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelType.json @@ -1,45 +1,45 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersion.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelVersion.json index d711102476..b0ccc8e050 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersion.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelVersion.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": ""
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelVersionId.json index e0d2948dda..103395eb77 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersionId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesModelVersionId.json @@ -1,46 +1,46 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesNameFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesNameFormat.json index 206f325857..e121bb89d7 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesNameFormat.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesNameFormat.json @@ -1,47 +1,47 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceName": "format test",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceName": "format test", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesServiceInstance.json index e1b5f21b3e..8620232de8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesServiceInstance.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVfModule.json index d59daaa1e5..7661411c11 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVfModule.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVfModule.json @@ -1,33 +1,33 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVnfInstance.json index 542f4e7738..d55395af9b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVnfInstance.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVnfInstanceId.json index 2be90cc906..4fcae49880 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstanceId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/RelatedInstancesVnfInstanceId.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/ServiceNoRelatedInstance.json index e5fec3a23e..447876913d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceNoRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/ServiceNoRelatedInstance.json @@ -1,23 +1,23 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelName": "test",
- "modelVersion": "test",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "test"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "aLaCarte": "true"
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelName": "test", + "modelVersion": "test", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "test" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "aLaCarte": "true" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VfModuleRelatedInstancesService.json index a1cab5ab01..9d7783bb8f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VfModuleRelatedInstancesService.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP13",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP13", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VfModuleRelatedInstancesVnf.json index 71d9e1e301..daff6e0884 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesVnf.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VfModuleRelatedInstancesVnf.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VnfRelatedInstancesService.json index 26dae2bc51..4eda56abcd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VnfRelatedInstancesService.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP13",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP13", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VolumeGroupRelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VolumeGroupRelatedInstances.json index f5aa7f46e4..58b265284f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VolumeGroupRelatedInstances.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/VolumeGroupRelatedInstances.json @@ -1,61 +1,61 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP13",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "volumeGroup", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP13", + "modelVersion": "1.0", + "modelCustomizationName": "test" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3VolumeGroupBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v4RelatedInstancesNull.json index 526be72895..9961344bcd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3VolumeGroupBad.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v4RelatedInstancesNull.json @@ -18,7 +18,7 @@ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": false, - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "requestParameters": { "autoBuildVfModules": true diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5ActivateNoRelatedInstance.json index 1c39843749..e1db4831f4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorNoRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5ActivateNoRelatedInstance.json @@ -1,20 +1,20 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoDestinationRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoDestinationRelatedInstance.json index 85a2017f58..5f6174b331 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoDestinationRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoDestinationRelatedInstance.json @@ -1,51 +1,51 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoRelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoRelatedInstances.json index 51f4a08816..21c0aa41fe 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoRelatedInstances.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoRelatedInstances.json @@ -1,23 +1,23 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoSourceRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoSourceRelatedInstance.json index fc934b2214..e7dd7f414c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoSourceRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5CreateNoSourceRelatedInstance.json @@ -1,51 +1,51 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "destination",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5DeactivateNoRelatedInstance.json index 1c39843749..e1db4831f4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorNoRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5DeactivateNoRelatedInstance.json @@ -1,20 +1,20 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoConnectionPoint.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5EnablePortNoConnectionPoint.json index 2e37674246..def72caf45 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoConnectionPoint.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5EnablePortNoConnectionPoint.json @@ -1,31 +1,31 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ]
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ] + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5EnablePortNoRelatedInstance.json index c676cd6d54..cb8063a7cb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoRelatedInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v5EnablePortNoRelatedInstance.json @@ -1,17 +1,17 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationshipsBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v6AddRelationshipsInstanceName.json index fbaaafaf14..66fae38377 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationshipsBadData.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v6AddRelationshipsInstanceName.json @@ -9,7 +9,7 @@ }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6VnfDeleteInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v6VnfDeleteInstance.json index 13c93869e0..b1c9e65bba 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6VnfDeleteInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v6VnfDeleteInstance.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v7CreateVnfNetworkCollection.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v7CreateVnfNetworkCollection.json new file mode 100644 index 0000000000..99ca7fcfb0 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RelatedInstances/v7CreateVnfNetworkCollection.json @@ -0,0 +1,56 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "9a10143a-13e3-4f56-8661-6625e6bcc310", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "VF01032017", + "modelVersion": "1.0", + "modelCustomizationId": "d752b40b-3e1f-4aac-95d0-9f257c74f442" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "MSOTEST103a", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "platform": { + "platformName": "platform" + }, + "lineOfBusiness": { + "lineOfBusinessName": "business" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "0fd90c0c-0e3a-46e2-abb5-4c4820d5985b", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "0fd90c0c-0e3a-46e2-abb5-4c4820d5985b", + "modelName": "Test", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "0fd90c0c-0e3a-46e2-abb5-4c4820d5985b", + "modelInfo": { + "modelType": "networkCollection" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false , + "aLaCarte": false, + "subscriptionServiceType": "test" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyRequestorId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/EmptyRequestorId.json index eb771a2479..17888adfa9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyRequestorId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/EmptyRequestorId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySource.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/EmptySource.json index c944b07bcc..3c9f54445b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySource.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/EmptySource.json @@ -1,35 +1,35 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/NetworkProductFamilyId.json index 5943319efa..4e7afc432e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkProductFamilyId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/NetworkProductFamilyId.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "network",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "requestInfo": {
- "productFamilyId": "",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "requestInfo": { + "productFamilyId": "", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestInfo.json index 37c12637dd..484f7bfc97 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfo.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestInfo.json @@ -1,35 +1,35 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfoNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestInfoNull.json index d1127c656a..9220d4dd22 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfoNull.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestInfoNull.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestorId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestorId.json index cc5936b943..8562be02b8 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestorId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/RequestorId.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyId.json index 733ce1d740..11d85a3397 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyId.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "requestInfo": {
- "productFamilyId": "",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "requestInfo": { + "productFamilyId": "", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdFlag.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyIdFlag.json index 4c4905add0..76ae344a02 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdFlag.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyIdFlag.json @@ -1,72 +1,72 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "volumeGroup",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "requestInfo": {
- "productFamilyId": "",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "volumeGroup", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "requestInfo": { + "productFamilyId": "", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyIdUpdate.json index 733ce1d740..11d85a3397 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdUpdate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/ServiceProductFamilyIdUpdate.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "requestInfo": {
- "productFamilyId": "",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "requestInfo": { + "productFamilyId": "", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/VnfProductFamilyId.json index d47b47597c..f810473171 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfProductFamilyId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestInfo/VnfProductFamilyId.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "requestInfo": {
- "productFamilyId": "",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": true,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "requestInfo": { + "productFamilyId": "", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": true, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json new file mode 100644 index 0000000000..9e571e6e37 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json @@ -0,0 +1,126 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "testModelName", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "testModelName", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673Mow", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mow", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mow", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673Mow", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignEmptyReqParameters.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignEmptyReqParameters.json new file mode 100644 index 0000000000..1d1b4636db --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignEmptyReqParameters.json @@ -0,0 +1,31 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json new file mode 100644 index 0000000000..26bb2172f8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json @@ -0,0 +1,133 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ], + "networks": [{ + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json new file mode 100644 index 0000000000..6b32f3ebe3 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json @@ -0,0 +1,138 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ], + "networks": [{ + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf970" + } + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json new file mode 100644 index 0000000000..1aa6094513 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json @@ -0,0 +1,137 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ], + "networks": [{ + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + } + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json new file mode 100644 index 0000000000..1fddf7970b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json @@ -0,0 +1,137 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ], + "networks": [{ + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + } + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json new file mode 100644 index 0000000000..f9a5ea9a01 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParameters.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParameters.json index e877dd140e..07de63cf0d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParameters.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParameters.json @@ -1,38 +1,38 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ]
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ] + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteTrue.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParametersALaCarteTrue.json index 931ac31503..7b46671afe 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteTrue.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParametersALaCarteTrue.json @@ -1,37 +1,37 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParametersNull.json index e70de00926..af80ed5d55 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersNull.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/RequestParametersNull.json @@ -1,21 +1,21 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelCustomizationId.json new file mode 100644 index 0000000000..01baeb841d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelCustomizationId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelInfo.json new file mode 100644 index 0000000000..4887c4b45b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelInfo.json @@ -0,0 +1,120 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW--BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json new file mode 100644 index 0000000000..8d3ed69863 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL.._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json new file mode 100644 index 0000000000..f05fdb06ba --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json @@ -0,0 +1,127 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json new file mode 100644 index 0000000000..4436baffe4 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json new file mode 100644 index 0000000000..e31523f99d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json @@ -0,0 +1,116 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json new file mode 100644 index 0000000000..0cf4928581 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL..vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json new file mode 100644 index 0000000000..5362b439dc --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json new file mode 100644 index 0000000000..ad1c02e37b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json @@ -0,0 +1,75 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json new file mode 100644 index 0000000000..81904fe66a --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json @@ -0,0 +1,125 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json new file mode 100644 index 0000000000..5b4097793c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "2016-73_MOW-BV-L" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json new file mode 100644 index 0000000000..b52be1f4c2 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json @@ -0,0 +1,128 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRequestParameters.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfRequestParameters.json index 43c72c5473..75d354b909 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRequestParameters.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfRequestParameters.json @@ -1,40 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "autoBuildVfModules": false,
- "usePreload": false,
- "cascadeDelete": false,
- "rebuildVolumeGroups": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "vnf", + "modelVersion": "2.0", + "modelCustomizationName":"", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "autoBuildVfModules": false, + "usePreload": false, + "cascadeDelete": false, + "rebuildVolumeGroups": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2requestParametersALaCarteFalse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/v2requestParametersALaCarteFalse.json index f63a8aa8d5..746e5a333c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2requestParametersALaCarteFalse.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/v2requestParametersALaCarteFalse.json @@ -1,44 +1,44 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "instanceName" : "testV2aLaCarteFlag",
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : false,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "instanceName" : "testV2aLaCarteFlag", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : false, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstanceALaCarte.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/v3DeleteServiceInstanceALaCarte.json index 5a9320675e..8709f0299d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstanceALaCarte.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/v3DeleteServiceInstanceALaCarte.json @@ -7,7 +7,7 @@ }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "requestParameters": { "aLaCarte": true, diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/AssignEmptySubscriberInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/AssignEmptySubscriberInfo.json new file mode 100644 index 0000000000..2c2c87ee07 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/AssignEmptySubscriberInfo.json @@ -0,0 +1,116 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyGlobalSubscriberId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptyGlobalSubscriberId.json index 9f2c8b7ed7..efb56a8b44 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyGlobalSubscriberId.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptyGlobalSubscriberId.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriberInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptySubscriberInfo.json index a0130347ec..ff35d945d0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriberInfo.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptySubscriberInfo.json @@ -1,32 +1,32 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriptionServiceType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptySubscriptionServiceType.json index 47bd161741..ecb4c7c74a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriptionServiceType.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SubscriberInfo/EmptySubscriptionServiceType.json @@ -1,41 +1,42 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "randomStrings", + "owningEntityName": "randomStrings" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/InstanceIdHashMap.json index 4f2fb9877e..1372b1fadd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid2.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/InstanceIdHashMap.json @@ -1,40 +1,40 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/NetworkType.json index 4ea0b65532..9bed4353b9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkType.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/NetworkType.json @@ -1,43 +1,43 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "TestNetworkType",
- "modelType": "network",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceAssign.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceAssign.json new file mode 100644 index 0000000000..2d7ab4ae7c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceAssign.json @@ -0,0 +1,130 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base__BV..module-0", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInPlaceSoftwareUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceInPlaceSoftwareUpdate.json index 1d6b9f5d6f..476b9367c1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInPlaceSoftwareUpdate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceInPlaceSoftwareUpdate.json @@ -1,42 +1,42 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "requestInfo": { + "instanceName": "MSO_Dev_1802_VNF_10-9-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false, + "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceUnassign.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceUnassign.json new file mode 100644 index 0000000000..4f56e1b373 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/ServiceUnassign.json @@ -0,0 +1,20 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "aLaCarte": false, + "userParams": [ + ] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/UserParams.json index 0fc5355369..d7ece6c356 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/UserParams.json @@ -1,59 +1,59 @@ -{
- "requestDetails": {
- "modelInfo":{
- "modelType": "vfModule",
- "modelName": "vSAMP10aDEV::base::module-0",
- "modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671",
- "modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671",
- "modelVersion": "2",
- "modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671"
- },
- "cloudConfiguration":{
- "lcpCloudRegionId": "mtn6",
- "tenantId": "0422ffb57ba042c0800a29dc85ca70f8"
- },
- "requestInfo":{
- "instanceName": "MSO-DEV-VF-1802-it3-pwt3-vSAMP10a-base-1002-RoutePrefixes",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "bs7527"
- },
- "relatedInstanceList": [{
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo":{
- "modelType": "service",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersion": "1.0"
- }
-
- }
- },{
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo":{
- "modelType": "vnf",
- "modelName": "vSAMP10a",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersion": "1.0",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671",
- "modelCustomizationName": "vSAMP10a 1"
- }
- }
- }],
- "requestParameters": {
- "usePreload": true,
- "controllerType": "appc",
- "userParams": [{
- "name": "vlc_sctp_b_route_prefixes",
- "value": [
- { "interface_route_table_routes_route_prefix": "107.239.41.163/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.164/32" },
- { "interface_route_table_routes_route_prefix": "107.239.41.165/32" }
- ]}
- ]}
- }
+{ + "requestDetails": { + "modelInfo":{ + "modelType": "vfModule", + "modelName": "vSAMP10aDEV::base::module-0", + "modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671", + "modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671", + "modelVersion": "2", + "modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671" + }, + "cloudConfiguration":{ + "lcpCloudRegionId": "mtn6", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8" + }, + "requestInfo":{ + "instanceName": "MSO-DEV-VF-1802-it3-pwt3-vSAMP10a-base-1002-RoutePrefixes", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo":{ + "modelType": "service", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersion": "1.0" + } + + } + },{ + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo":{ + "modelType": "vnf", + "modelName": "vSAMP10a", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersion": "1.0", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671", + "modelCustomizationName": "vSAMP10a 1" + } + } + }], + "requestParameters": { + "aLaCarte": true, + "usePreload": true, + "userParams": [{ + "name": "vlc_sctp_b_route_prefixes", + "value": [ + { "interface_route_table_routes_route_prefix": "107.239.41.163/32" }, + { "interface_route_table_routes_route_prefix": "107.239.41.164/32" }, + { "interface_route_table_routes_route_prefix": "107.239.41.165/32" } + ]} + ]} + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/VfModulesModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/VfModulesModelInfo.json new file mode 100644 index 0000000000..44a50e91cb --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/VfModulesModelInfo.json @@ -0,0 +1,120 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName": "MOW vMX BV 1 Service", + "modelVersion": "10" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "PACKET CORE" + }, + "project": { + "projectName": "{some project name}" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "VMX", + "aLaCarte": false, + "userParams": [ + { + "service": { + "modelInfo": { + "modelName": "MOW vMX BV 1 Service", + "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams": [], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "2016-73_MOW-BV-L 0", + "modelName": "2016-73_MOW-BV-L", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "platform": { + "platformName": "someValue" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams": [ + { + "instanceName": "someVnfInstanceName" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelName": "201673MowBvL._base_BV..module-0", + "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams": [ + { + "vmx_int_net_len": "24", + "asn": "someValue" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8", + "modelType": "vfModule" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "100" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vRE_BV..module-1", + "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vre_a_volume_size_0": "50" + } + ] + }, + { + "modelInfo": { + "modelName": "201673MowBvL._vPFE_BV..module-2", + "modelCustomizationId": "da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams": [ + { + "availability_zone_0": "mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0": "192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/VnfActivate.json index b79a4e711c..92174781f1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfActivate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/VnfActivate.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "subscriptionServiceType": "test",
- "autoBuildVfModules": false,
- "usePreload": false,
- "cascadeDelete": false,
- "rebuildVolumeGroups": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "SDNW Service 1710", + "modelType": "service", + "modelVersion": "2.0", + "modelCustomizationName":"", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "test", + "modelNameVersionId": "test" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false + }, + "requestParameters": { + "subscriptionServiceType": "test", + "autoBuildVfModules": false, + "usePreload": false, + "cascadeDelete": false, + "rebuildVolumeGroups": false, + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteNetwork.json index 98610afe6e..af5be5cef9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteNetwork.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteNetwork.json @@ -9,7 +9,7 @@ }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" } } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteServiceInstance.json index 4d1719f467..20b4b877fd 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteServiceInstance.json @@ -12,7 +12,7 @@ }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "requestParameters": { "aLaCarte": false, diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstanceBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteServiceInstanceALaCarte.json index dcf47d0aa0..8709f0299d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3DeleteServiceInstanceBad.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3DeleteServiceInstanceALaCarte.json @@ -5,16 +5,12 @@ "modelName": "Test", "modelVersion": "1.0" }, - "cloudConfiguration": { - "lcpCloudRegionId": "mdt1", - "tenantId": "88a6ca3ee0394ade9403f075db23167e" - }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "requestParameters": { - "aLaCarte": false, + "aLaCarte": true, "userParams": [ { "name": "someUserParam", diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3UpdateNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3UpdateNetwork.json index 2aef2e7604..fb57ba60b6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3UpdateNetwork.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3UpdateNetwork.json @@ -14,12 +14,12 @@ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": true, - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { "relatedInstance": { - "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", "modelInfo": { "modelType": "service", "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3VnfCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3VnfCreate.json index 90fc84178c..8ce0fd1c06 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v3VnfCreate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v3VnfCreate.json @@ -18,7 +18,7 @@ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": false, - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v4CreateVfModule.json index eb39ef12b9..0fa972b5fa 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v4CreateVfModule.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v4CreateVfModule.json @@ -1,62 +1,62 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelCustomizationId": "856f9806-b01a-11e6-80f5-76304dec7eb7",
- "modelName": "Test",
- "modelVersion": "1"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "MSOTEST103a-vSAMP12_base_module-0",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
- "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
- "modelInfo": {
- "modelType": "volumeGroup"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "Test",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP12 1"
- }
- }
- }
- ],
- "requestParameters": {
- "usePreload": true,
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelCustomizationId": "856f9806-b01a-11e6-80f5-76304dec7eb7", + "modelName": "Test", + "modelVersion": "1" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "MSOTEST103a-vSAMP12_base_module-0", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c", + "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol", + "modelInfo": { + "modelType": "volumeGroup" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP12 1" + } + } + } + ], + "requestParameters": { + "usePreload": true, + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5ActivateConfiguration.json index 2fa9327c40..e17757ea54 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5ActivateConfiguration.json @@ -1,35 +1,35 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
-
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5CreateConfiguration.json index ae0125224f..9822b1bfd0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5CreateConfiguration.json @@ -1,65 +1,65 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "destination",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5DeactivateConfiguration.json index 2fa9327c40..e17757ea54 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5DeactivateConfiguration.json @@ -1,35 +1,35 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
-
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5EnableConfiguration.json index da0b7b7cd7..e9a74025a1 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5EnableConfiguration.json @@ -1,40 +1,40 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "connectionPoint"
- }
- }
- }
- ]
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "connectionPoint" + } + } + } + ] + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5EnableService.json index 1ee5e86e07..b8d2135de5 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorService.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v5EnableService.json @@ -1,41 +1,41 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "connectionPoint"
- }
- }
- }
- ]
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "connectionPoint" + } + } + } + ] + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationships.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v6AddRelationships.json index 4b1c47f324..a26cf90ec3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationships.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v6AddRelationships.json @@ -9,7 +9,7 @@ }, "requestInfo": { "source": "VID", - "requestorId": "az2016" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6PortMirrorCreateConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v6CreateConfiguration.json index 2df5b22c5f..8ea0f4c54a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6PortMirrorCreateConfiguration.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/SuccessfulValidation/v6CreateConfiguration.json @@ -1,66 +1,66 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",
- "instanceName": "vSAMP12",
- "instanceDirection": "destination",
- "modelInfo": {
- "modelType": "pnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "CONTRAIL30_BASIC", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "instanceName":"port_mirror_config_12345", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + }, + { + "relatedInstance": { + "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", + "instanceName": "vSAMP12", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "pnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/AlaCarteRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/AlaCarteRequest.json new file mode 100644 index 0000000000..0eaa37b1f8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/AlaCarteRequest.json @@ -0,0 +1,36 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7fe", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff", + "modelName": "Test", + "modelVersion": "2.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "subscriberInfo": { + "globalSubscriberId": "{some subscriber id}", + "subscriberName": "{some subscriber name}" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx" + }, + "requestParameters": { + "subscriptionServiceType": "MOG", + "aLaCarte": false, + "alaCarte": false, + "userParams": [ + { + "name": "someUserParam", + "value": "someValue" + } + ] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json new file mode 100644 index 0000000000..124513de0d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json @@ -0,0 +1 @@ +{"requestList":[{"request":{"requestId":"00032ab7-3fb3-42e5-965d-8ea592502017","requestScope":"vfModule","requestType":"deleteInstance","requestDetails":{"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID","suppressRollback":false},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}},"instanceReferences":{"serviceInstanceId":"e3b5744d-2ad1-4cdd-8390-c999a38829bc","vnfInstanceId":"b92f60c8-8de3-46c1-8dc1-e4390ac2b005","vfModuleInstanceId":"c7d527b1-7a91-49fd-b97d-1c8c0f4a7992"},"requestStatus":{"requestState":"COMPLETE","statusMessage":"Vf Module has been deleted successfully.","percentProgress":100}}},{"request":{"requestId":"00032ab7-na18-42e5-965d-8ea592502018","requestScope":"vfModule","requestType":"deleteInstance","requestDetails":{"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID","suppressRollback":false},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}},"instanceReferences":{"serviceInstanceId":"e3b5744d-2ad1-4cdd-8390-c999a38829bc","vnfInstanceId":"b92f60c8-8de3-46c1-8dc1-e4390ac2b005","vfModuleInstanceId":"c7d527b1-7a91-49fd-b97d-1c8c0f4a7992"},"requestStatus":{"requestState":"PENDING","statusMessage":"Vf Module deletion pending.","percentProgress":0}}},{"request":{"requestId":"00093944-bf16-4373-ab9a-3adfe730ff2d","requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelInvariantId":"9647dfc4-2083-11e7-93ae-92361f002671","modelType":"service","modelName":"MSOTADevInfra_v10_Service","modelVersion":"1.0","modelVersionId":"5df8b6de-2083-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","instanceName":"MSODEV_1707_SI_v10_011-4","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true}},"instanceReferences":{},"requestStatus":{"requestState":"FAILED","statusMessage":"Error: Locked instance - This service (MSODEV_1707_SI_v10_011-4) already has a request being worked with a status of IN_PROGRESS (RequestId - 278e83b1-4f9f-450e-9e7d-3700a6ed22f4). The existing request must finish or be cleaned up before proceeding.","percentProgress":100}}},{"request":{"requestId":"001619d2-a297-4a4b-a9f5-e2823c88458f","requestScope":"vfModule","requestType":"createInstance","instanceReferences":{},"requestStatus":{"requestState":"COMPLETE","statusMessage":"COMPLETED","percentProgress":100}}},{"request":{"requestId":"00164b9e-784d-48a8-8973-bbad6ef818ed","requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelInvariantId":"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f","modelType":"service","modelName":"MSO Test Network","modelVersion":"1.0","modelVersionId":"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e"},"requestInfo":{"source":"VID","instanceName":"DEV-n6-3100-0927-1","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true}},"instanceReferences":{"serviceInstanceId":"b2f59173-b7e5-4e0f-8440-232fd601b865"},"requestStatus":{"requestState":"COMPLETE","statusMessage":"Service Instance was created successfully.","percentProgress":100}}},{"request":{"requestId":"00173cc9-5ce2-4673-a810-f87fefb2829e","requestScope":"service","requestType":"createInstance","requestDetails":{"modelInfo":{"modelInvariantId":"ff6163d4-7214-459e-9f76-507b4eb00f51","modelType":"service","modelName":"ConstraintsSrvcVID","modelVersion":"2.0","modelVersionId":"722d256c-a374-4fba-a14f-a59b76bb7656"},"requestInfo":{"productFamilyId":"LRSI-OSPF","source":"VID","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"cloudConfiguration":{"tenantId":"a259ae7b7c3f493cb3d91f95a7c18149","lcpCloudRegionId":"mtn16"},"requestParameters":{"subscriptionServiceType":"Mobility","userParams":[{"name":"neutronport6_name","value":"8"},{"name":"neutronnet5_network_name","value":"8"},{"name":"contrailv2vlansubinterface3_name","value":"false"}]}},"instanceReferences":{},"requestStatus":{"requestState":"FAILED","statusMessage":"Error parsing request. No valid instanceName is specified","percentProgress":100}}},{"request":{"requestId":"0017f68c-eb2d-45bb-b7c7-ec31b37dc349","requestScope":"configuration","requestType":"activateInstance","requestDetails":{"modelInfo":{"modelInvariantId":"1587cf0e-f12f-478d-8530-5c55ac578c39","modelType":"configuration","modelVersionId":"36a3a8ea-49a6-4ac8-b06c-89a545444455","modelCustomizationId":"68dc9a92-214c-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":[{"relatedInstance":{"instanceId":"9e15a443-af65-4f05-9000-47ae495e937d","modelInfo":{"modelInvariantId":"de19ae10-9a25-11e7-abc4-cec278b6b50a","modelType":"service","modelName":"MSOTADevInfra_Configuration_Service","modelVersion":"1.0","modelVersionId":"ee938612-9a25-11e7-abc4-cec278b6b50a"}}}],"cloudConfiguration":{"lcpCloudRegionId":"n6"},"requestParameters":{"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true}},"instanceReferences":{"serviceInstanceId":"9e15a443-af65-4f05-9000-47ae495e937d"},"requestStatus":{"requestState":"UNLOCKED","percentProgress":20}}},{"request": {"requestId":"0017f68c-eb2d-45bb-b7c7-ec31b37dc350","requestScope":"service","requestType":"createInstance","requestStatus": {"requestState": "IN_PROGRESS", "statusMessage": "Error parsing request.\n\tNo valid instanceName is specified"}}}]}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/Request.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/Request.json new file mode 100644 index 0000000000..29f6ee34e3 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/Request.json @@ -0,0 +1,8 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequestHandler/SampleGetResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequestHandler/SampleGetResponse.json new file mode 100644 index 0000000000..25b4ed81af --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequestHandler/SampleGetResponse.json @@ -0,0 +1,22 @@ +{ + "requestList": [ + { + "request": { + "finishTime": "2017-12-22 19:21:25.0", + "instanceReferences": { + "serviceInstanceId": "24b7a73a-ae87-453b-8639-1495feabeac1" + }, + "requestId": "000e480b-c55a-4116-a10b-51c312f46184", + "requestScope": "service", + "requestStatus": { + "percentProgress": 100, + "requestState": "FAILED", + "statusMessage": "Internal Error - Occured in CreateService createBandwidthConfigurationAAI", + "timeStamp": "2018-01-11 11:06:32.478" + }, + "requestType": "Create", + "startTime": "2017-12-22 19:21:18.0" + } + } + ] +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json deleted file mode 100644 index 1d96d8250c..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json +++ /dev/null @@ -1,41 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json deleted file mode 100644 index 84ce00ce23..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json +++ /dev/null @@ -1,43 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json deleted file mode 100644 index 85d13d032e..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json +++ /dev/null @@ -1,43 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json deleted file mode 100644 index 84ce00ce23..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json +++ /dev/null @@ -1,43 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json deleted file mode 100644 index 4f2fb9877e..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json +++ /dev/null @@ -1,40 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "owningEntity": {
- "owningEntityId": "oeId",
- "owningEntityName": "oeName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json deleted file mode 100644 index 81ec46a7e5..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json +++ /dev/null @@ -1,39 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json deleted file mode 100644 index 2be90cc906..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json +++ /dev/null @@ -1,48 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json deleted file mode 100644 index 4513bf11b3..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json +++ /dev/null @@ -1,48 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "volumeGroup",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json deleted file mode 100644 index 178016db5b..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json +++ /dev/null @@ -1,36 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/AddRelationships.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/AddRelationships.json new file mode 100644 index 0000000000..63f0a805e7 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/AddRelationships.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService33", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ApplyUpdatedConfig.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ApplyUpdatedConfig.json new file mode 100644 index 0000000000..25645ec9c8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ApplyUpdatedConfig.json @@ -0,0 +1,12 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testApplyUpdatedConfig" + }, + "requestParameters": { + "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ConvertRequestFail.json index 75f38914ce..3017e08d30 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ConvertRequestFail.json @@ -1,46 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationName": "test", + "test": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "test", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002672", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "f78914d9-423b-11e7-93f8-0050569a7967" + } + } + } + ], + "requestParameters": { + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json index 1e2ae2067f..58db9d4f76 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeactivateAndCloudDeleteVfModule.json @@ -1,15 +1,18 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "source": "VID",
- "requestorId": "az2016"
- },
- "requestParameters": {
- "payload": "{\"existing-software-version\": \"3.1\", \"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
-}
\ No newline at end of file +{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + } + } +} + + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json new file mode 100644 index 0000000000..d612dd9704 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVfModule.json @@ -0,0 +1,32 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService40" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"vfModule", + "modelName":"serviceModel", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnf.json new file mode 100644 index 0000000000..9c34cc4666 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnf.json @@ -0,0 +1,62 @@ +{ + "vnfInstanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelVersionId": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-9", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnfV5.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnfV5.json new file mode 100644 index 0000000000..1f5b7cb73b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVnfV5.json @@ -0,0 +1,22 @@ +{ + "requestDetails": { + "modelInfo":{ + "modelType": "vnf", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelName": "vSAMP10a", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP10a 1" + }, + "cloudConfiguration":{ + "lcpCloudRegionId": "mtn6", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8" + }, + "requestInfo":{ + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters":{ + "userParams": [] } + + } + }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVolumeGroup.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVolumeGroup.json new file mode 100644 index 0000000000..17e03ab97f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/DeleteVolumeGroup.json @@ -0,0 +1,60 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService81" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"volumeGroup", + "modelName":"serviceModel", + "modelCustomizationId": "b4ea86b4-253f-11e7-93ae-92361f002671" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate.json new file mode 100644 index 0000000000..6d5275ecc8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate.json @@ -0,0 +1,16 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "inPlaceSoftwareUpdateTest" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestParameters": { + "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate2.json new file mode 100644 index 0000000000..46fe53c597 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/InPlaceSoftwareUpdate2.json @@ -0,0 +1,16 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "bs7527", + "instanceName": "duplicateCheck123" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestParameters": { + "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/LegacyMacroServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/LegacyMacroServiceInstance.json new file mode 100644 index 0000000000..4028c80303 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/LegacyMacroServiceInstance.json @@ -0,0 +1,74 @@ +{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "282bdcd2-34ed-4665-9ab2-63455814531d", + "modelType": "service", + "modelName": "MOW_ADIG_test_BV_IST", + "modelVersion": "1.0", + "modelVersionId": "109a153e-325f-4df5-8161-edd91314daee", + "modelUuid": "109a153e-325f-4df5-8161-edd91314daee", + "modelInvariantUuid": "282bdcd2-34ed-4665-9ab2-63455814531d" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt25b", + "tenantId": "aefb697db6524ddebfe4915591b0a347" + }, + "requestInfo": { + "productFamilyId": "testaaS", + "source": "VID", + "suppressRollback": false, + "requestorId": "ss616y" + }, + "subscriberInfo": { + "globalSubscriberId": "21014aa2-526b-11e6-beb8-9e71128cae77" + }, + "requestParameters": { + "subscriptionServiceType": "test", + "userParams": [{ + "name": "mow_adig_test_ist0_vnf_instance_name", + "value": "wswdc403me6" + },{ + "name": "mow_adig_test_bv_ist0_bandwidth", + "value": "Gbps" + }, { + "name": "mow_adig_test_bv_ist0_vnf_config_template_version", + "value": "17.2" + }, { + "name": "mow_adig_test_ist0_vnf_config_template_version", + "value": "17.2" + }, { + "name": "mow_adig_test_bv_ist0_ASN", + "value": "2685" + }, { + "name": "mow_adig_test_bv_ist0_bandwidth_units", + "value": "Gbps" + }, { + "name": "mow_adig_test_bv_ist0_availability_zone_0", + "value": "mdt25b-kvm-az01" + }, { + "name": "mow_adig_test_bv_ist0_vnf_config_template", + "value": "17.2" + }, { + "name": "mow_adig_test_ist0_bandwidth_units", + "value": "Gbps" + }, { + "name": "mow_adig_test_bv_ist0_vnf_instance_name", + "value": "wswdc403me6" + }, { + "name": "mow_adig_test_bv_ist0_vnf_instance", + "value": "wswdc403me6" + }, { + "name": "mow_adig_test_bv_ist0_AIC_CLLI", + "value": "MTSNJA4LCP1" + }], + "aLaCarte": false + }, + "project": { + "projectName": "GigaPower" + }, + "owningEntity": { + "owningEntityId": "2811e2fb-005e-40de-990b-c0794f362399", + "owningEntityName": "PACKET-CORE" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/MacroServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/MacroServiceInstance.json new file mode 100644 index 0000000000..cd1db84831 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/MacroServiceInstance.json @@ -0,0 +1,129 @@ +{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "282bdcd2-34ed-4665-9ab2-63455814531d", + "modelType": "service", + "modelName": "MOW_ADIG_test_BV_IST", + "modelVersion": "1.0", + "modelVersionId": "109a153e-325f-4df5-8161-edd91314daee", + "modelUuid": "109a153e-325f-4df5-8161-edd91314daee", + "modelInvariantUuid": "282bdcd2-34ed-4665-9ab2-63455814531d" + }, + "requestInfo": { + "productFamilyId": "testaaS", + "source": "VID", + "suppressRollback": false, + "requestorId": "ss616y" + }, + "subscriberInfo": { + "globalSubscriberId": "21014aa2-526b-11e6-beb8-9e71128cae77" + }, + "requestParameters": { + "subscriptionServiceType": "test", + "userParams": [ + { + "service": { + "modelInfo": { + "modelVersionId": "109a153e-325f-4df5-8161-edd91314daee", + "modelName": "MOW_ADIG_test_BV_IST", + "modelType": "service" + }, + "instanceParams": [ + { + "mow_adig_test_bv_ist0_bandwidth": "10", + "mow_adig_test_bv_ist0_ASN": "2685", + "mow_adig_test_bv_ist0_availability_zone_0": "mdt25b-kvm-az01", + "mow_adig_test_bv_ist0_AIC_CLLI": "MTSNJA4LCP1", + "mow_adig_test_bv_ist0_vnf_config_template_version": "17.2", + "mow_adig_test_bv_ist0_vnf_instance_name": "wswdc403me6", + "mow_adig_test_bv_ist0_bandwidth_units": "Gbps" + } + ], + "resources": { + "vnfs": [ + { + "modelInfo": { + "modelCustomizationName": "MOW_ADIG_test_BV_IST 0", + "modelCustomizationId": "31d41ef2-0a3e-43bf-a4f0-0b1f31b1cbac", + "modelInvariantId": "33fb95d0-5f18-4dfb-8e7d-0c8ac8d743c5", + "modelVersionId": "bdf50902-4b07-4dcf-a2e2-ec6cfe568798", + "modelName": "MOW_ADIG_test_BV_IST", + "modelType": "service", + "modelVersion": "2.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt25b", + "tenantId": "aefb697db6524ddebfe4915591b0a347" + }, + "platform": { + "platformName": "AIC" + }, + "lineOfBusiness": {}, + "productFamilyId": "testaaS", + "instanceParams": [ + { + "mow_adig_test_bv_ist0_vnf_config_template": "17.2", + "mow_adig_test_bv_ist0_vnf_instance": "wswdc403me6", + "mow_adig_test_bv_ist0_bandwidth": "Gbps" + } + ], + "vfModules": [ + { + "modelInfo": { + "modelCustomizationName": "MowAdigtestBvIst..ADIG_vRE_BV_v2..module-1", + "modelCustomizationId": "34c57c2d-cf19-4926-9296-acde6a967f70", + "modelInvariantId": "f3093158-a609-41d5-a2fb-07dbc0ca8096", + "modelVersionId": "2507f79d-6e1b-413b-b2a8-c434113ff862", + "modelName": "MowAdigtestBvIst..ADIG_vRE_BV_v2..module-1", + "modelType": "service", + "modelVersion": "1" + }, + "instanceParams": [ + { + "mow_adig_test_ist0_vnf_config_template_version": "17.2", + "mow_adig_test_ist0_vnf_instance_name": "wswdc403me6", + "mow_adig_test_ist0_bandwidth_units": "Gbps" + } + ] + }, + { + "modelInfo": { + "modelCustomizationName": "MowAdigtestBvIst..ADIG_base_test_BV_v2..module-0", + "modelCustomizationId": "f4a414c4-b71a-43ed-82be-51478d7e154f", + "modelInvariantId": "af867fdc-3808-4b62-ae76-bdb1b9ae7ee8", + "modelVersionId": "3fcf6cb6-2ef2-4154-99a6-06ce889c79f1", + "modelName": "MowAdigtestBvIst..ADIG_base_test_BV_v2..module-0", + "modelType": "service", + "modelVersion": "1" + }, + "instanceParams": [] + }, + { + "modelInfo": { + "modelCustomizationName": "MowAdigtestBvIst..ADIG_vPFE_BV_v2..module-2", + "modelCustomizationId": "583c2280-23d9-4338-a607-69c238d4899d", + "modelInvariantId": "90c2be4f-cb6f-4e75-9c65-04fdc5c30cef", + "modelVersionId": "7c8a69e0-6612-4b7b-8e9c-fb8b9f31cb4f", + "modelName": "MowAdigtestBvIst..ADIG_vPFE_BV_v2..module-2", + "modelType": "service", + "modelVersion": "1" + } + } + ] + } + ] + } + } + } + ], + "aLaCarte": false + }, + "project": { + "projectName": "GigaPower" + }, + "owningEntity": { + "owningEntityId": "2811e2fb-005e-40de-990b-c0794f362399", + "owningEntityName": "PACKET-CORE" + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreate.json index dec16a46a8..1185651862 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkModelName.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreate.json @@ -1,43 +1,45 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "",
- "modelType": "network",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "subscriptionServiceType": "MSO-dev-service-type",
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- },
- "project": {
- "projectName": "projectName"
- },
- "owningEntity": {
- "owningEntityId": "randomStrings",
- "owningEntityName": "randomStrings"
- }
- }
+{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "test1" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateAlternateInstanceName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateAlternateInstanceName.json new file mode 100644 index 0000000000..c82724a520 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateAlternateInstanceName.json @@ -0,0 +1,45 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "test2" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiGrApi.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiGrApi.json new file mode 100644 index 0000000000..63df0c3072 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiGrApi.json @@ -0,0 +1,46 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "test3" + }, + "requestParameters": { + "aLaCarte" : true, + "testApi": "GR_API", + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiIncorrect.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiIncorrect.json new file mode 100644 index 0000000000..6a454d8f4f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiIncorrect.json @@ -0,0 +1,46 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "test4" + }, + "requestParameters": { + "aLaCarte" : true, + "testApi": "invalidTestApi", + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiVnfApi.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiVnfApi.json new file mode 100644 index 0000000000..b12ace880a --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkCreateTestApiVnfApi.json @@ -0,0 +1,46 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "test5" + }, + "requestParameters": { + "aLaCarte" : true, + "testApi": "VNF_API", + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstance.json new file mode 100644 index 0000000000..993310d48f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstance.json @@ -0,0 +1,45 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "tested" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json new file mode 100644 index 0000000000..cfd19ff0ca --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NetworkInstanceNoReqParams.json @@ -0,0 +1,15 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "network" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NoVnfResource.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NoVnfResource.json new file mode 100644 index 0000000000..824ce21bba --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/NoVnfResource.json @@ -0,0 +1,49 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationName": "test", + "modelCustomizationId": "ff5256d2-5a33-55df-13ab-12abad84e7ee" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-21", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002672", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "f78914d9-423b-11e7-93f8-0050569a7967" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/RemoveRelationships.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/RemoveRelationships.json new file mode 100644 index 0000000000..30e4f95622 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/RemoveRelationships.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService34", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json new file mode 100644 index 0000000000..967250a0da --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVfModule.json @@ -0,0 +1,32 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService60" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"vfModule", + "modelName":"serviceModel", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnf.json new file mode 100644 index 0000000000..013b9f5722 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnf.json @@ -0,0 +1,62 @@ +{ + "vnfInstanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelVersionId": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-10", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnfRecreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnfRecreate.json new file mode 100644 index 0000000000..688f99cc8e --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ReplaceVnfRecreate.json @@ -0,0 +1,62 @@ +{ + "vnfInstanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7f0", + "modelName": "vSAMP12..base..module-23", + "modelVersion": "1", + "modelVersionId": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002674" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-13", + "source": "VID", + "suppressRollback": true, + "requestorId": "bp896r", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceAssign.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceAssign.json new file mode 100644 index 0000000000..7625bf7589 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceAssign.json @@ -0,0 +1,134 @@ +{ + "requestDetails":{ + "modelInfo":{ + "modelType":"service", + "modelInvariantId":"5d48acb5-097d-4982-aeb2-f4a3bd87d31b", + "modelVersionId":"3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelName":"MOW vMX BV 1 Service", + "modelVersion":"10.0" + }, + "cloudConfiguration":{ + "lcpCloudRegionId":"mdt1", + "tenantId":"88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity":{ + "owningEntityId":"038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName":"PACKET CORE" + }, + "project":{ + "projectName":"{some project name}" + }, + "subscriberInfo":{ + "globalSubscriberId":"{some subscriber id}" + }, + "requestInfo":{ + "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source":"VID", + "suppressRollback":true, + "requestorId":"xxxxxx" + }, + "requestParameters":{ + "subscriptionServiceType":"VMX", + "aLaCarte":false, + "userParams":[ + { + "service":{ + "modelInfo":{ + "modelType":"service", + "modelName":"MOW", + "modelVersionId":"3c40d244-808e-42ca-b09a-256d83d19d0a", + "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a" + }, + "instanceParams":[ + + ], + "resources":{ + "vnfs":[ + { + "modelInfo":{ + "modelType":"vnf", + "modelName":"2016-73_MOW", + "modelVersionId":"7f40c192-f63c-463e-ba94-286933b895f8", + "modelCustomizationName":"2016-73_MOW", + "modelCustomizationId":"ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration":{ + "lcpCloudRegionId":"mdt1", + "tenantId":"88a6ca3ee0394ade9403f075db23167e" + }, + "platform":{ + "platformName":"test" + }, + "lineOfBusiness":{ + "lineOfBusinessName":"someValue" + }, + "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceParams":[ + + ], + "vfModules":[ + { + "modelInfo":{ + "modelType":"vfModule", + "modelName":"201673MowtestBvL", + "modelVersionId":"4c75f813-fa91-45a4-89d0-790ff5f1ae79", + "modelCustomizationId":"a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f" + }, + "instanceParams":[ + { + "vmx_int_net_len":"24" + } + ] + }, + { + "modelInfo":{ + "modelType":"vfModule", + "modelName":"201673Mowtest", + "modelVersionId":"56e2b103-637c-4d1a-adc8-3a7f4a6c3240", + "modelCustomizationId":"72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams":[ + { + "availability_zone_0":"mtpocdv-kvm-az01", + "vre_a_volume_size_0":"100" + } + ] + }, + { + "modelInfo":{ + "modelType":"vfModule", + "modelName":"201673Mowtest", + "modelVersionId":"56e2b103-637c-4d1a-adc8-3a7f4a6c3240", + "modelCustomizationId":"72d9d1cd-f46d-447a-abdb-451d6fb05fa8" + }, + "instanceParams":[ + { + "availability_zone_0":"mtpocdv-kvm-az01", + "vre_a_volume_size_0":"50" + } + ] + }, + { + "modelInfo":{ + "modelType":"vfModule", + "modelName":"201673Mowtest", + "modelVersionId":"f555558f-d538-4876-8ffa-b102650fad64", + "modelCustomizationId":"da4d4327-fb7d-4311-ac7a-be7ba60cf969" + }, + "instanceParams":[ + { + "availability_zone_0":"mtpocdv-kvm-az01", + "vmx_vpfe_int_ip_0":"192.168.0.16" + } + ] + } + ] + } + ] + } + } + } + ] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstance.json new file mode 100644 index 0000000000..ce1a4e3309 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstance.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrue.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrue.json new file mode 100644 index 0000000000..69bffdbf5f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrue.json @@ -0,0 +1,31 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService7" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7967", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrueNoRecipe.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrueNoRecipe.json new file mode 100644 index 0000000000..d42f260c77 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceALaCarteTrueNoRecipe.json @@ -0,0 +1,32 @@ +{ + "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService7" + }, + "requestParameters": { + "aLaCarte": true, + "testApi": "VNF_API", + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"100", + "modelVersionId":"100", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json new file mode 100644 index 0000000000..d675c79f06 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivate.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService2", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1.0", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivatePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivatePort.json new file mode 100644 index 0000000000..d0493b9961 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceActivatePort.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService31", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceBadGateway.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceBadGateway.json new file mode 100644 index 0000000000..427dde39b9 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceBadGateway.json @@ -0,0 +1,31 @@ +{ "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "test", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService63" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivate.json new file mode 100644 index 0000000000..65a950f95b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivate.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService3", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1.0", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivatePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivatePort.json new file mode 100644 index 0000000000..3029ec5403 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDeactivatePort.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService32", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDefault.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDefault.json new file mode 100644 index 0000000000..848313d94b --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDefault.json @@ -0,0 +1,32 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService9" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel", + "modelInstanceName":"modelInstanceName", + "modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDelete.json new file mode 100644 index 0000000000..5468befe45 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDelete.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService4", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1.0", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDisablePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDisablePort.json new file mode 100644 index 0000000000..b4c9ea070f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDisablePort.json @@ -0,0 +1,70 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService30", + "productFamilyId": "test" + }, + "requestParameters": { + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"configuration", + "modelName":"serviceModel" + }, + "cloudConfiguration": { + "tenantId": "d88c0bd297524867b8b0a597b95b7b2a", + "lcpCloudRegionId": "au7tx" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelInfo": { + "modelType": "connectionPoint" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDuplicates.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDuplicates.json new file mode 100644 index 0000000000..5331e05aea --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceDuplicates.json @@ -0,0 +1,31 @@ +{ "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "test", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService10" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7967", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEmpty.json new file mode 100644 index 0000000000..516d509b42 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEmpty.json @@ -0,0 +1,31 @@ +{ "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "test", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService3" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEnablePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEnablePort.json new file mode 100644 index 0000000000..a0d16bd569 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceEnablePort.json @@ -0,0 +1,66 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService6", + "productFamilyId": "test" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceMacro.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceMacro.json new file mode 100644 index 0000000000..a57ca506ec --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceMacro.json @@ -0,0 +1,34 @@ +{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "2077f51f-320f-47d2-8a80-f80da39228ec", + "modelType": "service", + "modelName": "OAM Net IST 1806", + "modelVersion": "2.0", + "modelVersionId": "15a772d0-077a-4758-ac50-9e7e00d811ab", + "modelUuid": "15a772d0-077a-4758-ac50-9e7e00d811ab", + "modelInvariantUuid": "2077f51f-320f-47d2-8a80-f80da39228ec" + }, + "requestInfo": { + "productFamilyId": "vHNPaas", + "source": "VID", + "suppressRollback": false, + "requestorId": "pa2396" + }, + "subscriberInfo": { + "globalSubscriberId": "21014aa2-526b-11e6-beb8-9e71128cae77" + }, + "cloudConfiguration": { + "tenantId": "d88c0bd297524867b8b0a597b95b7b2a", + "lcpCloudRegionId": "au7tx" + }, + "requestParameters": { + "subscriptionServiceType": "test", + "aLaCarte": false + }, + "owningEntity": { + "owningEntityId": "2811e2fb-005e-40de-990b-c0794f362399", + "owningEntityName": "PACKET-CORE" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoRecipe.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoRecipe.json new file mode 100644 index 0000000000..a97bfaac03 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoRecipe.json @@ -0,0 +1,31 @@ +{ + "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService8" + }, + "requestParameters": { + "aLaCarte": false, + "testApi": "VNF_API", + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceParseFail.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceParseFail.json new file mode 100644 index 0000000000..775c18a7a6 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceParseFail.json @@ -0,0 +1,65 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService21" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePortConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePortConfiguration.json new file mode 100644 index 0000000000..ab89f7a4de --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePortConfiguration.json @@ -0,0 +1,65 @@ +{ "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7968", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "f7ce78bb-423b-11e7-93f8-0050569a7970", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService5", + "productFamilyId": "test" + }, + "requestParameters": { + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion": "1", + "modelVersionId":"1", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceName": "cisco", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "APCON", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + }, + { + "relatedInstance": { + "instanceName": "G10", + "modelInfo": { + "modelType": "pnf" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev7.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev7.json new file mode 100644 index 0000000000..04263e80a5 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev7.json @@ -0,0 +1,32 @@ +{ + "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7990", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testServicePrev7", + "productFamilyId": "test" + }, + "requestParameters": { + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1.0", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel", + "modelInstanceName":"modelInstanceName", + "modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev8.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev8.json new file mode 100644 index 0000000000..f339e1b13c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstancePrev8.json @@ -0,0 +1,32 @@ +{ + "serviceInstanceId":"f7ce78bb-423b-11e7-93f8-0050569a7999", + "vnfInstanceId":"188293", + "networkInstanceId":"188297", + "volumeGroupInstanceId":"188935", + "vfModuleInstanceId":"182934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService1234", + "productFamilyId": "test" + }, + "requestParameters": { + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1.0", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel", + "modelInstanceName":"modelInstanceName", + "modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceStatusError.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceStatusError.json new file mode 100644 index 0000000000..de3e38ca8d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceStatusError.json @@ -0,0 +1,31 @@ +{ "serviceInstanceId":"1882940", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "configurationId": "test", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService1" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965", + "modelVersion":"1", + "modelVersionId":"10", + "modelType":"service", + "modelName":"serviceModel" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceRequestExpected.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceRequestExpected.json new file mode 100644 index 0000000000..45775cd805 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceRequestExpected.json @@ -0,0 +1,72 @@ +{ + "variables": { + "bpmnRequest": { + "value": "{\"requestDetails\":{\"modelInfo\":{\"modelInvariantId\":\"f7ce78bb-423b-11e7-93f8-0050569a7965\",\"modelType\":\"service\",\"modelName\":\"serviceModel\",\"modelVersion\":\"1\",\"modelVersionId\":\"10\",\"modelUuid\":\"10\",\"modelInvariantUuid\":\"f7ce78bb-423b-11e7-93f8-0050569a7965\"},\"requestInfo\":{\"source\":\"VID\",\"instanceName\":\"testService9\",\"suppressRollback\":false,\"requestorId\":\"xxxxxx\"},\"subscriberInfo\":{\"globalSubscriberId\":\"MSO_1610_dev\",\"subscriberName\":\"MSO_1610_dev\"},\"requestParameters\":{\"alaCarte\":true,\"subscriptionServiceType\":\"test\",\"aLaCarte\":true,\"autoBuildVfModules\":false}},\"serviceInstanceId\":\"1882939\",\"vnfInstanceId\":\"1882938\",\"networkInstanceId\":\"1882937\",\"volumeGroupInstanceId\":\"1882935\",\"vfModuleInstanceId\":\"1882934\"}", + "type": "String" + }, + "requestId": { + "value": "c2d5adfc-a4ce-4764-b25a-ce7988c0d5e7", + "type": "String" + }, + "mso-request-id": { + "value": "c2d5adfc-a4ce-4764-b25a-ce7988c0d5e7", + "type": "String" + }, + "isBaseVfModule": { + "value": false, + "type": "Boolean" + }, + "recipeTimeout": { + "value": 180, + "type": "Integer" + }, + "requestAction": { + "value": "createInstance", + "type": "String" + }, + "serviceInstanceId": { + "value": "1882939", + "type": "String" + }, + "vnfId": { + "value": "1882938", + "type": "String" + }, + "vfModuleId": { + "value": "1882934", + "type": "String" + }, + "volumeGroupId": { + "value": "1882935", + "type": "String" + }, + "networkId": { + "value": "1882937", + "type": "String" + }, + "configurationId": { + "value": "", + "type": "String" + }, + "serviceType": { + "value": "", + "type": "String" + }, + "vnfType": { + "value": "", + "type": "String" + }, + "vfModuleType": { + "value": "", + "type": "String" + }, + "networkType": { + "value": "", + "type": "String" + }, + "host": { + "value": "localhost", + "type": "String" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceUnassign.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceUnassign.json new file mode 100644 index 0000000000..a06524d996 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceUnassign.json @@ -0,0 +1,21 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + }, + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService200" + }, + "requestParameters": { + "aLaCarte": false, + "userParams": [ + ] + } + } +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateNetwork.json new file mode 100644 index 0000000000..ba4763639d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateNetwork.json @@ -0,0 +1,45 @@ +{ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "19123c2924c648eb8e42a3c1f14b7682" + }, + "modelInfo": { + "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", + "modelName": "TestNetworkType", + "modelType": "network", + "modelVersion": "2.0", + "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", + "modelCustomizationId": "3bdbb104-476c-483e-9f8b-c095b3d308ac" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId": "xxxxxx", + "source": "VID", + "suppressRollback": false, + "instanceName": "tested2" + }, + "requestParameters": { + "aLaCarte" : true, + "autoBuildVfModules": false, + "subscriptionServiceType": "MSO-dev-service-type", + "userParams": [ + { + "name": "aic_zone", + "value": "mtn6" + } + ] + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "project": { + "projectName": "projectName" + }, + "owningEntity": { + "owningEntityId": "oeId", + "owningEntityName": "oeName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json new file mode 100644 index 0000000000..c3039a59f0 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVfModule.json @@ -0,0 +1,60 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService70" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"vfModule", + "modelName":"serviceModel", + "modelCustomizationId": "b4ea86b4-253f-11e7-93ae-92361f002671" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ] + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json new file mode 100644 index 0000000000..ec2916f0da --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVnf.json @@ -0,0 +1,62 @@ +{ + "vnfInstanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelVersionId": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-8", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVolumeGroup.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVolumeGroup.json new file mode 100644 index 0000000000..4c2962fc4f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/UpdateVolumeGroup.json @@ -0,0 +1,60 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService50" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"volumeGroup", + "modelName":"serviceModel", + "modelCustomizationId": "b4ea86b4-253f-11e7-93ae-92361f002671" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleInstance.json new file mode 100644 index 0000000000..2b8d4df3d4 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleInstance.json @@ -0,0 +1,32 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"vfModule", + "modelName":"serviceModel", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "subscriberInfo": { + "globalSubscriberId": "MSO_1610_dev", + "subscriberName": "MSO_1610_dev" + } + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesInstanceDirection.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleInvalid.json index 9570528931..ed77f9b9fb 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesInstanceDirection.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleInvalid.json @@ -1,50 +1,61 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "configuration",
- "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",
- "modelName": "CONTRAIL30_BASIC",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1"
- },
- "requestInfo": {
- "instanceName":"port_mirror_config_12345",
- "source": "VID",
- "requestorId": "az2016"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- }
- }
-}
+{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService62" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "8b1df54faa3b49078e3416e21370a3ba" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"2", + "modelVersionId":"f7ce78bb-423b-11e7-93f8-0050569a7969", + "modelType":"vfModule", + "modelName":"serviceModel" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b", + "modelCustomizationName": "test" + } + } + } + ] + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoMatchingModelUUID.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoMatchingModelUUID.json new file mode 100644 index 0000000000..86854cbd98 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoMatchingModelUUID.json @@ -0,0 +1,60 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "zz9999", + "instanceName": "testvfModule" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "8b1df54faa3b49078e3416e21370a3ba" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"2", + "modelType":"vfModule", + "modelName":"serviceModel" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "tested", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "tested", + "modelName": "vSAMP12", + "modelVersion": "2.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b", + "modelCustomizationName": "test" + } + } + } + ] + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelCustomization.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelCustomization.json new file mode 100644 index 0000000000..a6b2b0bd2f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelCustomization.json @@ -0,0 +1,61 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService61" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "8b1df54faa3b49078e3416e21370a3ba" + }, + "requestParameters": { + "aLaCarte": false, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"2", + "modelVersionId":"066de97e-253e-11e7-93ae-92361f002672", + "modelType":"vfModule", + "modelName":"serviceModel" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b", + "modelCustomizationName": "test" + } + } + } + ] + } +} + +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelType.json new file mode 100644 index 0000000000..09fc8f69ff --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleNoModelType.json @@ -0,0 +1,20 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "zz9999", + "instanceName": "testVfModule2" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a79", + "modelVersion":"1", + "modelName":"serviceModel" + } + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleWithRelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleWithRelatedInstances.json new file mode 100644 index 0000000000..99f23732c8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VfModuleWithRelatedInstances.json @@ -0,0 +1,54 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vfModule", + "modelName": "vSAMP10aDEV::base::module-0", + "modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671", + "modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671", + "modelVersion": "2", + "modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8" + }, + "requestInfo": { + "instanceName": "MSO-DEV-VF-1806BB-vSAMP10a-base-it2-1", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "7a88cbeb-0ec8-4765-a271-4f9e90c3da7b", + "modelInfo": { + "modelType": "service", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "cbba721b-4803-4df7-9347-307c9a955426", + "modelInfo": { + "modelType": "vnf", + "modelName": "vSAMP10a", + "modelVersionId": "d40be095-940e-4738-a72a-59aa9eb5671e", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersion": "1.0", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671", + "modelCustomizationName": "vSAMP10a 1" + } + } + } + ], + "requestParameters": { + "usePreload": true, + "userParams": [] + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfCreateDefault.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfCreateDefault.json new file mode 100644 index 0000000000..8f8b614139 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfCreateDefault.json @@ -0,0 +1,47 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelName": "vSAMP10a", + "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", + "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", + "modelVersion": "1.0", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671", + "modelCustomizationName": "vSAMP10a 1" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mtn6", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8" + }, + "requestInfo": { + "instanceName": "MSO-DEV-VNF-1802-BB-vSAMP10a-3-6-1", + "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611", + "source": "VID", + "suppressRollback": false, + "requestorId": "xxxxxx" + }, + "platform": { + "platformName": "vSAMP10a 1XX1 Replace Platform" + }, + "lineOfBusiness": { + "lineOfBusinessName": "vSAMP10a-That_Work 1XX1 Replace LLC" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "49585b36-2b5a-443a-8b10-c75d34bb5e46", + "modelInfo": { + "modelType": "service", + "modelName": "MSOTADevInfra_vSAMP10a_Service", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", + "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "autoBuildVfModules": false + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleVnfInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithServiceRelatedInstance.json index a650c7d475..f6d2f4dd5f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleVnfInstance.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithServiceRelatedInstance.json @@ -1,48 +1,48 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vfModule",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",
- "modelCustomizationName": "test"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0",
- "modelCustomizationName": "test"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationName": "test" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002672", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "f78914d9-423b-11e7-93f8-0050569a7967" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceDirection.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithServiceRelatedInstanceFail.json index 75f38914ce..bbca6d95ab 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceDirection.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithServiceRelatedInstanceFail.json @@ -1,46 +1,47 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12..base..module-0",
- "modelVersion": "1",
- "modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mdt1",
- "tenantId": "88a6ca3ee0394ade9403f075db23167e"
- },
- "requestInfo": {
- "instanceName": "VNFTEST-7",
- "source": "VID",
- "suppressRollback": true,
- "requestorId": "bp896r",
- "productFamilyId": "FamilyID"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "userParams": []
- },
- "platform": {
- "platformName": "platformName"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "lobName"
- }
- }
+{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "test", + "modelVersionId": "f78914d9-423b-11e7-93f8-0050569a796l", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithVnfRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithVnfRelatedInstance.json new file mode 100644 index 0000000000..f8813b0ea7 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VnfWithVnfRelatedInstance.json @@ -0,0 +1,62 @@ +{ + "vnfInstanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff", + "modelName": "vSAMP12..base..module-0", + "modelVersion": "1", + "modelVersionId": "1", + "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "VNFTEST-7", + "source": "VID", + "suppressRollback": true, + "requestorId": "xxxxxx", + "productFamilyId": "FamilyID" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ], + "requestParameters": { + "aLaCarte": true, + "userParams": [] + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lobName" + } + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VolumeGroup.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VolumeGroup.json new file mode 100644 index 0000000000..6ad8d93f0f --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/VolumeGroup.json @@ -0,0 +1,60 @@ +{ + "serviceInstanceId":"1882939", + "vnfInstanceId":"1882938", + "networkInstanceId":"1882937", + "volumeGroupInstanceId":"1882935", + "vfModuleInstanceId":"1882934", + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "xxxxxx", + "instanceName": "testService80" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestParameters": { + "aLaCarte": true, + "autoBuildVfModules": false, + "subscriptionServiceType": "test" + }, + "modelInfo":{ + "modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelVersion":"1", + "modelVersionId":"test", + "modelType":"volumeGroup", + "modelName":"serviceModel", + "modelCustomizationId": "b4ea86b4-253f-11e7-93ae-92361f002671" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "f7ce78bb-423b-11e7-93f8-0050569a7968", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0" + } + } + }, + { + "relatedInstance": { + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b" + } + } + } + ] + } +} +
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/userParams.txt b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/userParams.txt new file mode 100644 index 0000000000..23a4e3e9e1 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/userParams.txt @@ -0,0 +1,37 @@ +[{ + name=mow_adig_test_ist0_vnf_instance_name, + value=wswdc403me6 +},{ + name=mow_adig_test_bv_ist0_bandwidth, + value=Gbps +}, { + name=mow_adig_test_bv_ist0_vnf_config_template_version, + value=17.2 +}, { + name=mow_adig_test_ist0_vnf_config_template_version, + value=17.2 +}, { + name=mow_adig_test_bv_ist0_ASN, + value=2685 +}, { + name=mow_adig_test_bv_ist0_bandwidth_units, + value=Gbps +}, { + name=mow_adig_test_bv_ist0_availability_zone_0, + value=mdt25b-kvm-az01 +}, { + name=mow_adig_test_bv_ist0_vnf_config_template, + value=17.2 +}, { + name=mow_adig_test_ist0_bandwidth_units, + value=Gbps +}, { + name=mow_adig_test_bv_ist0_vnf_instance_name, + value=wswdc403me6 +}, { + name=mow_adig_test_bv_ist0_vnf_instance, + value=wswdc403me6 +}, { + name=mow_adig_test_bv_ist0_AIC_CLLI, + value=MTSNJA4LCP1 +}]
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json deleted file mode 100644 index 9f7c420bc7..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json +++ /dev/null @@ -1,41 +0,0 @@ -{
- "requestDetails": {
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",
- "modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",
- "modelName": "vSAMP10a",
- "modelVersion": "1.0",
- "modelCustomizationName": "vSAMP10a 1",
- "modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "requestInfo": {
- "instanceName": "MSO_Dev_1802_VNF_10-9-1",
- "productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",
- "suppressRollback": false,
- "requestorId": "md5621"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",
- "modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",
- "modelName": "MSOTADevInfra_vSAMP10a_Service",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "autoBuildVfModules": false,
- "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
- }
- }
-}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ActivateOperationEnvironment.json index 0acd26d77f..051ab02ae7 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironment.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ActivateOperationEnvironment.json @@ -1,33 +1,33 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "instanceName": "myVnfOpEnv",
- "source": "VID",
- "requestorId": "az2017"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "resourceType": "operationalEnvironment",
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceName": "name"
- }
- }
- ],
- "requestParameters": {
- "operationalEnvironmentType": "VNF",
- "workloadContext": "VNF_E2E-IST",
- "manifest": {
- "serviceModelList": [{
- "serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "recoveryAction": "abort"
- },
- {
- "serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "recoveryAction": "retry"
- }]
- }
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "instanceName": "myVnfOpEnv", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "resourceType": "operationalEnvironment", + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceName": "name" + } + } + ], + "requestParameters": { + "operationalEnvironmentType": "VNF", + "workloadContext": "VNF_E2E-IST", + "manifest": { + "serviceModelList": [{ + "serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "recoveryAction": "abort" + }, + { + "serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "recoveryAction": "retry" + }] + } + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ActivateOperationEnvironmentInvalid.json index 60d5d9198a..4613727dbc 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironmentInvalid.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ActivateOperationEnvironmentInvalid.json @@ -1,23 +1,23 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "instanceName": "myVnfOpEnv",
- "source": "VID",
- "requestorId": "az2017"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "resourceType": "operationalEnvironment",
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceName": "name"
- }
- }
- ],
- "requestParameters": {
- "operationalEnvironmentType": "VNF",
- "workloadContext": "VNF_E2E-IST"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "instanceName": "myVnfOpEnv", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "resourceType": "operationalEnvironment", + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceName": "name" + } + } + ], + "requestParameters": { + "operationalEnvironmentType": "VNF", + "workloadContext": "VNF_E2E-IST" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json index f3c3535423..c605fe53e0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironment.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json @@ -1,12 +1,12 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "source": "VID",
- "requestorId": "az2017"
- },
- "requestParameters": {
- "operationalEnvironmentType": "VNF"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "operationalEnvironmentType": "VNF" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/DeactivateOperationEnvironmentInvalid.json index 998f5654aa..4fb330cb5b 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironmentInvalid.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/DeactivateOperationEnvironmentInvalid.json @@ -1,12 +1,12 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "source": "VID",
- "requestorId": "az2017"
- },
- "requestParameters": {
- "operationalEnvironmentType": "ECOMP"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "operationalEnvironmentType": "ECOMP" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ECOMPOperationEnvironmentCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json index f1589003f4..97fdc669f4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ECOMPOperationEnvironmentCreate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json @@ -1,15 +1,15 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "instanceName": "myOpEnv",
- "source": "VID",
- "requestorId": "az2017"
- },
- "requestParameters": {
- "operationalEnvironmentType": "ECOMP",
- "tenantContext": "Test",
- "workloadContext": "ECOMP_E2E-IST"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "instanceName": "myOpEnv", + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "operationalEnvironmentType": "ECOMP", + "tenantContext": "Test", + "workloadContext": "ECOMP_E2E-IST" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json index f8585bcef2..b3ccd7d2ff 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreate.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json @@ -1,24 +1,24 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "instanceName": "myVnfOpEnv",
- "source": "VID",
- "requestorId": "az2017"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "resourceType": "operationalEnvironment",
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "instanceName": "name"
- }
- }
- ],
- "requestParameters": {
- "operationalEnvironmentType": "VNF",
- "tenantContext": "Test",
- "workloadContext": "VNF_E2E-IST"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "instanceName": "myVnfOpEnv", + "source": "VID", + "requestorId": "xxxxxx" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "resourceType": "operationalEnvironment", + "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", + "instanceName": "name" + } + } + ], + "requestParameters": { + "operationalEnvironmentType": "VNF", + "tenantContext": "Test", + "workloadContext": "VNF_E2E-IST" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreateInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/VNFOperationEnvironmentCreateInvalid.json index c61c095329..91ee50630a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreateInvalid.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/TenantIsolation/VNFOperationEnvironmentCreateInvalid.json @@ -1,15 +1,15 @@ -{
- "requestDetails": {
- "requestInfo": {
- "resourceType": "operationalEnvironment",
- "instanceName": "myVnfOpEnv",
- "source": "VID",
- "requestorId": "az2017"
- },
- "requestParameters": {
- "operationalEnvironmentType": "VNF",
- "tenantContext": "Test",
- "workloadContext": "VNF_E2E-IST"
- }
- }
+{ + "requestDetails": { + "requestInfo": { + "resourceType": "operationalEnvironment", + "instanceName": "myVnfOpEnv", + "source": "VID", + "requestorId": "xxxxxx" + }, + "requestParameters": { + "operationalEnvironmentType": "VNF", + "tenantContext": "Test", + "workloadContext": "VNF_E2E-IST" + } + } }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json deleted file mode 100644 index f25a759cd6..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json +++ /dev/null @@ -1,38 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json deleted file mode 100644 index f25a759cd6..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json +++ /dev/null @@ -1,38 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json deleted file mode 100644 index 0bfa74fa1c..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json +++ /dev/null @@ -1,37 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "service",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json deleted file mode 100644 index 2d11862ad9..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json +++ /dev/null @@ -1,65 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
- "modelCustomizationName": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- },
- {
- "relatedInstance": {
- "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
- "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
- "modelName": "vSAMP12",
- "modelVersion": "1.0"
- }
- }
- }
- ],
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json deleted file mode 100644 index d7cef6a7a6..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json +++ /dev/null @@ -1,39 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationName": "",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json deleted file mode 100644 index 3503ee845d..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json +++ /dev/null @@ -1,39 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelName": "SDNW Service 1710",
- "modelType": "vnf",
- "modelVersion": "2.0",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelCustomizationName": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNErrorResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNErrorResponse.json new file mode 100644 index 0000000000..e63e233bb9 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNErrorResponse.json @@ -0,0 +1,7 @@ +{ + "response":"\n{\"requestReferences\":{\"instanceId\":\"MACRO REQUEST ON action\",\"requestId\": \"111\"}}\n\t\t\t", + "message":"Error", + "processInstanceID":"8878ccf8-1efc-11e8-b332-0050569a141e", + "variables":null, + "messageCode":505 +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNResponse.json new file mode 100644 index 0000000000..3285e0fed9 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AVPNBPMNResponse.json @@ -0,0 +1,7 @@ +{ + "response":"\n{\"requestReferences\":{\"instanceId\":\"MACRO REQUEST ON action\",\"requestId\": \"111\"}}\n\t\t\t", + "message":"Success", + "processInstanceID":"8878ccf8-1efc-11e8-b332-0050569a141e", + "variables":null, + "messageCode":202 +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AsyncProcessResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AsyncProcessResponse.json new file mode 100644 index 0000000000..b548e52c8c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/AsyncProcessResponse.json @@ -0,0 +1,6 @@ +{ + "requestReferences": { + "instanceId": "1882939", + "requestId": "da101014-8747-4034-8535-8fb73e490434" + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/BPMNResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/BPMNResponse.json new file mode 100644 index 0000000000..67c9005d56 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/BPMNResponse.json @@ -0,0 +1,7 @@ +{ + "response":"\n{\n\t\"serviceInstanceRequestReference\": {\n\t\t\"serviceInstanceId\": \"\",\n\t\t\"requestId\": \"\"\n\t}\n}\n\t\t\t", + "message":"Success", + "processInstanceID":"8878ccf8-1efc-11e8-b332-0050569a141e", + "variables":null, + "messageCode":202 +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/ErrorBPEL.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/ErrorBPEL.json new file mode 100644 index 0000000000..53d60a3db4 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/ErrorBPEL.json @@ -0,0 +1 @@ +{ "response": "<xml>xml</xml>","messageCode": 2000,"message": "Request Failed due to BPEL error","processInstanceID":null,"variables":null}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskResponse.json new file mode 100644 index 0000000000..18fb828a57 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskResponse.json @@ -0,0 +1,48 @@ +[ + { + "id": "TaskId300", + "name": "My Task 300", + "assignee": "assignee1", + "created": "2018-01-09T01:32:02.750+0000", + "due": null, + "followUp": null, + "delegationState": "PENDING", + "description": "This have to be done very urgent", + "executionId": null, + "owner": "owner1", + "parentTaskId": null, + "priority": 30, + "processDefinitionId": null, + "processInstanceId": null, + "taskDefinitionKey": null, + "caseExecutionId": null, + "caseInstanceId": "aCaseInstanceId", + "caseDefinitionId": null, + "suspended": false, + "formKey": null, + "tenantId": null + }, + { + "id": "b5fa707a-f55a-11e7-a796-005056856d52", + "name": "Manual Handling User Task", + "assignee": null, + "created": "2018-01-09T16:32:40.704+0000", + "due": null, + "followUp": null, + "delegationState": null, + "description": null, + "executionId": "b5d02c31-f55a-11e7-a796-005056856d52", + "owner": null, + "parentTaskId": null, + "priority": 50, + "processDefinitionId": "ManualHandling:62:1694eb4e-f4ac-11e7-bf39-005056856d52", + "processInstanceId": "b5d02c31-f55a-11e7-a796-005056856d52", + "taskDefinitionKey": "ManualHandlingUserTask", + "caseExecutionId": null, + "caseInstanceId": null, + "caseDefinitionId": null, + "suspended": false, + "formKey": null, + "tenantId": null + } +] diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskVariablesResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskVariablesResponse.json new file mode 100644 index 0000000000..d5a26d714c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/GetTaskVariablesResponse.json @@ -0,0 +1,109 @@ +{ + "subscriptionServiceType": { + "type": "String", + "value": "PORT-MIRROR", + "valueInfo": {} + }, + "currentActivity": { + "type": "String", + "value": "UpdateConfigurationState", + "valueInfo": {} + }, + "validResponses": { + "type": "String", + "value": "rollback, skip, manual, abort", + "valueInfo": {} + }, + "serviceType": { + "type": "String", + "value": "PORT-MIRROR", + "valueInfo": {} + }, + "msoRequestId": { + "type": "String", + "value": "4f6fe9ac-800c-4540-a93e-10d179fa1b0a", + "valueInfo": {} + }, + "vnfType": { + "type": "String", + "value": "VPROBE", + "valueInfo": {} + }, + "originalRequestorId": { + "type": "String", + "value": "VID", + "valueInfo": {} + }, + "errorSource": { + "type": "String", + "value": "SDNO", + "valueInfo": {} + }, + "errorText": { + "type": "String", + "value": "SDN-O exception: failed with message FAIL - AnsibleOperations exception: Failed : HTTP error code : 400 - Error Msg : no node list provided and no inventory file found", + "valueInfo": {} + }, + "taskId": { + "type": "String", + "value": "b5fa707a-f55a-11e7-a796-005056856d52", + "valueInfo": {} + }, + "nfRole": { + "type": "String", + "value": "VPROBE", + "valueInfo": {} + },"updateRequestResponse": { + "type": "String", + "value": "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body><ns2:updateInfraRequestResponse xmlns:ns2=\"http://org.onap.so/requestsdb\"/></soap:Body></soap:Envelope>", + "valueInfo": {} + }, + "failedActivity": { + "type": "String", + "value": "SDNO", + "valueInfo": {} + }, + "originalRequestId": { + "type": "String", + "value": "4f6fe9ac-800c-4540-a93e-10d179fa1b0a", + "valueInfo": {} + },"errorMessage": { + "type": "String", + "value": "SDN-O exception: failed with message FAIL - AnsibleOperations exception: Failed : HTTP error code : 400 - Error Msg : no node list provided and no inventory file found", + "valueInfo": {} + },"workStep": { + "type": "String", + "value": "Configurationactivate SDNO Post-Check", + "valueInfo": {} + }, + "URN_log_debug_asyncQueryAAICustomer": { + "type": "String", + "value": "true", + "valueInfo": {} + }, + "URN_mso_workflow_default_aai_v11_l3_network_uri": { + "type": "String", + "value": "/aai/v11/network/l3-networks/l3-network", + "valueInfo": {} + },"errorCode": { + "type": "String", + "value": "1002", + "valueInfo": {} + },"vnfName": { + "type": "Null", + "value": null, + "valueInfo": {} + },"buildingBlockName": { + "type": "String", + "value": "UpdateConfigurationState", + "valueInfo": {} + },"buildingBlockStep": { + "type": "String", + "value": "Configurationactivate SDNO Post-Check", + "valueInfo": {} + },"type": { + "type": "String", + "value": "fallout", + "valueInfo": {} + } +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/SuccessfulResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/SuccessfulResponse.json new file mode 100644 index 0000000000..bcbaa86101 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/SuccessfulResponse.json @@ -0,0 +1,4 @@ +{ + "response":"success", + "message":"success" +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponse.json new file mode 100644 index 0000000000..8c706b7b5c --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponse.json @@ -0,0 +1,7 @@ +{ + "response": "{\"requestReferences\": {\"instanceId\": \"1882939\"}}", + "messageCode": "1", + "message": "Success", + "processInstanceID": "1", + "variables": "null" +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid.json new file mode 100644 index 0000000000..2d9e3ddef8 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid.json @@ -0,0 +1,7 @@ +{ + "response":"<aetgt:WorkflowException xmlns:aetgt=\"http://org.onap/so/workflow/schema/v1\"><aetgt:ErrorMessage>Exception in create execution list 500 </aetgt:ErrorMessage><aetgt:ErrorCode>7000</aetgt:ErrorCode></aetgt:WorkflowException>", + "message":"Fail", + "processInstanceID":"4b33ca85-5860-11e8-ae53-0a580ae94342", + "variables":null, + "messageCode":500 +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid2.json new file mode 100644 index 0000000000..f821d11549 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/Camunda/TestResponseInvalid2.json @@ -0,0 +1,7 @@ +{ + "response": "{\"instanceId\": \"1882939\"}", + "messageCode": "1", + "message": "test", + "processInstanceID": "1", + "variables": "null" +}
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json index defe3ac670..74a1bc866a 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json @@ -1,10 +1,10 @@ -{
- "operational-environment-id": "testASDCDistributionId",
- "operational-environment-name": "testASDCDistributionIName",
- "operational-environment-type": "VNF",
- "operational-environment-status": "ACTIVE",
- "tenant-context": "Test",
- "workload-context": "PVT",
- "resource-version": "1505228226913",
- "relationship-list": []
+{ + "operational-environment-id": "testASDCDistributionId", + "operational-environment-name": "testASDCDistributionIName", + "operational-environment-type": "VNF", + "operational-environment-status": "ACTIVE", + "tenant-context": "Test", + "workload-context": "PVT", + "resource-version": "1505228226913", + "relationship-list": [] }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json index 5fc454b61a..d99b70e65f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json @@ -1,9 +1,9 @@ -{
- "operational-environment-id": "EMOE-001",
- "operational-environment-name": "Test Managing ECOMP Environment",
- "operational-environment-type": "ECOMP",
- "operational-environment-status": "SUCCESS",
- "tenant-context": "Test",
- "workload-context": "PVT",
- "resource-version": "1505228226913"
+{ + "operational-environment-id": "EMOE-001", + "operational-environment-name": "Test Managing ECOMP Environment", + "operational-environment-type": "ECOMP", + "operational-environment-status": "SUCCESS", + "tenant-context": "Test", + "workload-context": "PVT", + "resource-version": "1505228226913" }
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json index 8785efe5d7..8902031961 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json @@ -5,7 +5,7 @@ "resourceType": "operationalEnvironment", "instanceName": "myVnfOpEnv", "source": "VID", - "requestorId": "az2017" + "requestorId": "xxxxxx" }, "relatedInstanceList": [ { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json index 20947540b4..7e92c21c9e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json @@ -7,7 +7,7 @@ "minor": 0, "patch": "0" }, - "hostAddress": "135.144.120.218", + "hostAddress": "192.168.120.218", "listenPort": "32004", "latitude": "37.7022", "longitude": "121.9358", @@ -54,7 +54,7 @@ "minor": 0, "patch": "0" }, - "hostAddress": "135.144.120.22", + "hostAddress": "192.168.120.22", "listenPort": "32004", "latitude": "1.0", "longitude": "1.0", @@ -101,7 +101,7 @@ "minor": 0, "patch": "0" }, - "hostAddress": "135.144.120.218", + "hostAddress": "192.168.120.218", "listenPort": "32002", "latitude": "1.0", "longitude": "1.0", diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml new file mode 100644 index 0000000000..4f565a8c2d --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml @@ -0,0 +1,124 @@ +# will be used as entry in DB to say SITE OFF/ON for healthcheck + +server: + port: 8080 + tomcat: + max-threads: 50 +ssl-enable: false + +apih-healthcheck-urn: /ecomp/mso/healthcheck,/ecomp/mso/homing/healthcheck,/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck,/ecomp/mso/catalog/v2/healthcheck +jra-healthcheck-urn: /networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck,/appc/rest/healthcheck,/workflows/messages/healthcheck +camunda-healthcheck-urn: /mso/healthcheck + +apih-nodehealthcheck-urn: /ecomp/mso/infra/nodehealthcheck +jra-nodehealthcheck-urn: /adapters/rest/nodehealthcheck +camunda-nodehealthcheck-urn: /mso/nodehealthcheck + + + +mso: + logPath: logs + site-name: mtanj + catalog: + db: + spring: + endpoint: "http://localhost:" + db: + auth: Basic YnBlbDptc28tZGItMTUwNyE= + config: + path: /src/main/resources/ + infra: + default: + alacarte: + orchestrationUri: /mso/async/services/ALaCarteOrchestrator + recipeTimeout: 180 + testApi: GR_API + service: + macro: + default: + testApi: GR_API + versions: + apiMinorVersion: 0 + apiPatchVersion: 0 + camundaURL: http://localhost:${wiremock.server.port}/ + camundaAuth: F8E9452B55DDE4CCE77547B0E748105C54CF5EF1351B4E2CBAABF2981EFE776D + async: + core-pool-size: 50 + max-pool-size: 50 + queue-capacity: 500 + sdc: + client: + auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862 + activate: + instanceid: test + userid: cs0008 + endpoint: http://localhost:${wiremock.server.port} + msoKey: 07a7159d3bf51a0e53be7a8f89699be7 + tenant: + isolation: + retry: + count: 3 + aai: + endpoint: http://localhost:${wiremock.server.port} + auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764 + grm: + endpoint: http://localhost:${wiremock.server.port} + username: gmruser + password: test + so: + operational-environment: + dmaap: + username: testuser + password: VjR5NDcxSzA= + host: http://localhost:${wiremock.server.port} + publisher: + topic: test.operationalEnvironmentEvent + + +spring: + datasource: + url: jdbc:mariadb://localhost:3307/catalogdb + username: root + password: password + driver-class-name: org.mariadb.jdbc.Driver + initialize: true + initialization-mode: never + jpa: + generate-ddl: false + show-sql: false + hibernate: + ddl-auto: none + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect + jersey: + type: filter + security: + usercredentials: + - + username: test + password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu' + role: InfraPortal-Client +request: + datasource: + url: jdbc:mariadb://localhost:3307/requestdb + username: root + password: password + driver-class-name: org.mariadb.jdbc.Driver + intialize: false + +mariaDB4j: + dataDir: + port: 3307 + databaseName: catalogdb + databaseName2: requestdb +#Actuator +management: + context-path: /manage + endpoints: + enabled-by-default: false + endpoint: + info: + enabled: true + health: + enabled: true
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/data.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/data.sql new file mode 100644 index 0000000000..54984eeabb --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/data.sql @@ -0,0 +1,291 @@ + +--Changes here should also be made in InfraActiveRequestsReset.sql to be re-inserted after tests +INSERT INTO requestdb.infra_active_requests(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES +('00032ab7-3fb3-42e5-965d-8ea592502017', '00032ab7-3fb3-42e5-965d-8ea592502016', 'deleteInstance', 'COMPLETE', 'Vf Module has been deleted successfully.', '100', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null), +('00032ab7-na18-42e5-965d-8ea592502018', '00032ab7-fake-42e5-965d-8ea592502018', 'deleteInstance', 'PENDING', 'Vf Module deletion pending.', '0', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"requestDetails": {"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null), +('00093944-bf16-4373-ab9a-3adfe730ff2d', null, 'createInstance', 'FAILED', 'Error: Locked instance - This service (MSODEV_1707_SI_v10_011-4) already has a request being worked with a status of IN_PROGRESS (RequestId - 278e83b1-4f9f-450e-9e7d-3700a6ed22f4). The existing request must finish or be cleaned up before proceeding.', '100', '2017-07-11 18:33:26', '2017-07-11 18:33:26', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelInvariantId":"9647dfc4-2083-11e7-93ae-92361f002671","modelType":"service","modelName":"Infra_v10_Service","modelVersion":"1.0","modelVersionId":"5df8b6de-2083-11e7-93ae-92361f002671"},"requestInfo":{"source":"VID","instanceName":"MSODEV_1707_SI_v10_011-4","suppressRollback":false,"requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true}}', null, 'APIH', null, null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'service', 'createInstance', null, 'MSODEV_1707_SI_v10_011-4', 'xxxxxx', null, null, null, null), +('001619d2-a297-4a4b-a9f5-e2823c88458f', '001619d2-a297-4a4b-a9f5-e2823c88458f', 'CREATE_VF_MODULE', 'COMPLETE', 'COMPLETED', '100', '2016-07-01 14:11:42', '2017-05-02 16:03:34', 'PORTAL', null, 'test-vscp', 'elena_test21', null, null, '381b9ff6c75e4625b7a4182f90fc68d3', null, null, null, '{"requestDetails": {"modelInfo":{"modelType":"vfModule","modelName":"test::base::module-0"},"requestInfo":{"source":"VID"},"cloudConfiguration":{"tenantId":"6accefef3cb442ff9e644d589fb04107","lcpCloudRegionId":"n6"}}}', 'NONE', 'RDBTEST', '2016-07-01 14:11:42', 'VNF', null, null, null, 'MODULENAME1', 'moduleModelName', 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb', 'mtn9', null, null, null, null, null, 'vfModule', 'createInstance', null, null, null, null, null, null, null), +('5ffbabd6-b793-4377-a1ab-082670fbc7ac', '5ffbabd6-b793-4377-a1ab-082670fbc7ac', 'deleteInstance', 'PENDING', 'Vf Module deletion pending.', '0', '2016-12-22 18:59:54', '2016-12-22 19:00:28', 'VID', 'b92f60c8-8de3-46c1-8dc1-e4390ac2b005', null, null, null, null, '6accefef3cb442ff9e644d589fb04107', null, null, null, '{"requestDetails": {"modelInfo": {"modelType": "vfModule","modelName": "test::base::module-0","modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671","modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671","modelVersion": "2","modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671"},"cloudConfiguration": {"lcpCloudRegionId": "n6","tenantId": "0422ffb57ba042c0800a29dc85ca70f8"},"requestInfo": {"instanceName": "MSO-DEV-VF-1806BB-v10-base-it2-1","source": "VID","suppressRollback": false,"requestorId": "xxxxxx"},"relatedInstanceList": [{"relatedInstance": {"instanceId": "76fa8849-4c98-473f-b431-2590b192a653","modelInfo": {"modelType": "service","modelName": "Infra_v10_Service","modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671","modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671","modelVersion": "1.0"}}},{"relatedInstance": {"instanceId": "d57970e1-5075-48a5-ac5e-75f2d6e10f4c","modelInfo": {"modelType": "vnf","modelName": "v10","modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671","modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671","modelVersion": "1.0","modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671","modelCustomizationName": "v10 1"}}}],"requestParameters": {"usePreload": true,"userParams": []}}}', null, 'BPMN', '2016-12-22 19:00:28', null, null, null, 'c7d527b1-7a91-49fd-b97d-1c8c0f4a7992', null, 'test::base::module-0', null, 'n6', null, null, null, null, null, 'vfModule', 'deleteInstance', 'e3b5744d-2ad1-4cdd-8390-c999a38829bc', null, null, null, null, null, null); +INSERT INTO requestdb.infra_active_requests(REQUEST_ID, CLIENT_REQUEST_ID, ACTION, REQUEST_STATUS, STATUS_MESSAGE, PROGRESS, START_TIME, END_TIME, SOURCE, VNF_ID, VNF_NAME, VNF_TYPE, SERVICE_TYPE, AIC_NODE_CLLI, TENANT_ID, PROV_STATUS, VNF_PARAMS, VNF_OUTPUTS, REQUEST_BODY, RESPONSE_BODY, LAST_MODIFIED_BY, MODIFY_TIME, REQUEST_TYPE, VOLUME_GROUP_ID, VOLUME_GROUP_NAME, VF_MODULE_ID, VF_MODULE_NAME, VF_MODULE_MODEL_NAME, AAI_SERVICE_ID, AIC_CLOUD_REGION, CALLBACK_URL, CORRELATOR, NETWORK_ID, NETWORK_NAME, NETWORK_TYPE, REQUEST_SCOPE, REQUEST_ACTION, SERVICE_INSTANCE_ID, SERVICE_INSTANCE_NAME, REQUESTOR_ID, CONFIGURATION_ID, CONFIGURATION_NAME, OPERATIONAL_ENV_ID, OPERATIONAL_ENV_NAME) VALUES +('00164b9e-784d-48a8-8973-bbad6ef818ed', null, 'createInstance', 'COMPLETE', 'Service Instance was created successfully.', '100', '2017-09-28 12:45:51', '2017-09-28 12:45:53', 'VID', null, null, null, null, null, '19123c2924c648eb8e42a3c1f14b7682', null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f","modelType":"service","modelNameVersionId":null,"modelName":"MSO Test Network","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":"DEV-n6-3100-0927-1","suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":null,"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"},"cloudConfiguration":{"aicNodeClli":null,"tenantId":"19123c2924c648eb8e42a3c1f14b7682","lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":"MSO-dev-service-type","userParams":[{"name":"someUserParam","value":"someValue"}],"aLaCarte":true,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'CreateGenericALaCarteServiceInstance', '2017-09-28 12:45:52', null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'service', 'createInstance', 'b2f59173-b7e5-4e0f-8440-232fd601b865', 'DEV-n6-3100-0927-1', 'xxxxxx', null, null, null, null), +('00173cc9-5ce2-4673-a810-f87fefb2829e', null, 'createInstance', 'FAILED', 'Error parsing request. No valid instanceName is specified', '100', '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', null, null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, '{"modelInfo":{"modelInvariantId":"ff6163d4-7214-459e-9f76-507b4eb00f51","modelType":"service","modelName":"ConstraintsSrvcVID","modelVersion":"2.0","modelVersionId":"722d256c-a374-4fba-a14f-a59b76bb7656"},"requestInfo":{"productFamilyId":"LRSI-OSPF","source":"VID","requestorId":"xxxxxx"},"subscriberInfo":{"globalSubscriberId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"cloudConfiguration":{"tenantId":"a259ae7b7c3f493cb3d91f95a7c18149","lcpCloudRegionId":"mtn16"},"requestParameters":{"subscriptionServiceType":"Mobility","userParams":[{"name":"neutronport6_name","value":"8"},{"name":"neutronnet5_network_name","value":"8"},{"name":"contrailv2vlansubinterface3_name","value":"false"}]}}', null, 'APIH', null, null, null, null, null, null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', null, null, null, null, null, null, null), +('0017f68c-eb2d-45bb-b7c7-ec31b37dc349', null, 'activateInstance', 'UNLOCKED', null, '20', '2017-09-26 16:09:29', null, 'VID', null, null, null, null, null, null, null, null, null, '{"modelInfo":{"modelCustomizationName":null,"modelInvariantId":"1587cf0e-f12f-478d-8530-5c55ac578c39","modelType":"configuration","modelNameVersionId":null,"modelName":null,"modelVersion":null,"modelCustomizationUuid":null,"modelVersionId":"36a3a8ea-49a6-4ac8-b06c-89a545444455","modelCustomizationId":"68dc9a92-214c-11e7-93ae-92361f002671","modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"requestInfo":{"billingAccountNumber":null,"callbackUrl":null,"correlator":null,"orderNumber":null,"productFamilyId":null,"orderVersion":null,"source":"VID","instanceName":null,"suppressRollback":false,"requestorId":"xxxxxx"},"relatedInstanceList":[{"relatedInstance":{"instanceName":null,"instanceId":"9e15a443-af65-4f05-9000-47ae495e937d","modelInfo":{"modelCustomizationName":null,"modelInvariantId":"de19ae10-9a25-11e7-abc4-cec278b6b50a","modelType":"service","modelNameVersionId":null,"modelName":"Infra_Configuration_Service","modelVersion":"1.0","modelCustomizationUuid":null,"modelVersionId":"ee938612-9a25-11e7-abc4-cec278b6b50a","modelCustomizationId":null,"modelUuid":null,"modelInvariantUuid":null,"modelInstanceName":null},"instanceDirection":null}}],"subscriberInfo":null,"cloudConfiguration":{"aicNodeClli":null,"tenantId":null,"lcpCloudRegionId":"n6"},"requestParameters":{"subscriptionServiceType":null,"userParams":[],"aLaCarte":false,"autoBuildVfModules":false,"cascadeDelete":false,"usePreload":true},"project":null,"owningEntity":null,"platform":null,"lineOfBusiness":null}', null, 'APIH', '2017-09-26 16:09:29', null, null, null, null, null, null, null, 'n6', null, null, null, null, null, 'configuration', 'activateInstance', '9e15a443-af65-4f05-9000-47ae495e937d', null, 'xxxxxx', '26ef7f15-57bb-48df-8170-e59edc26234c', null, null, null),('0017f68c-eb2d-45bb-b7c7-ec31b37dc350', null, 'createInstance', 'IN_PROGRESS', 'Error parsing request. + No valid instanceName is specified', null, '2017-04-14 21:08:46', '2017-04-14 21:08:46', 'VID', + '1882938', null, null, null, null, 'a259ae7b7c3f493cb3d91f95a7c18149', null, null, null, + '{"serviceInstanceId":"1882939","vnfInstanceId":"1882938","networkInstanceId":"1882937","volumeGroupInstanceId":"1882935","vfModuleInstanceId":"1882934","requestDetails":{"requestInfo":{"source":"VID","requestorId":"xxxxxx","instanceName":"testService9"},"requestParameters":{"aLaCarte":true,"autoBuildVfModules":false,"subscriptionServiceType":"test"},"modelInfo":{"modelInvariantId":"f7ce78bb-423b-11e7-93f8-0050569a7965","modelVersion":"1","modelVersionId":"10","modelType":"service","modelName":"serviceModel","modelInstanceName":"modelInstanceName","modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796"},"subscriberInfo":{"globalSubscriberId":"MSO_1610_dev","subscriberName":"MSO_1610_dev"}}}', + null, 'APIH', null, null, '1882935', null, '1882934', null, null, null, 'mtn16', null, null, null, null, null, 'service', 'createInstance', '1882939', 'testService10', 'xxxxxx', 'test', null, null, null); + + +INSERT INTO requestdb.site_status(SITE_NAME, STATUS, CREATION_TIMESTAMP) VALUES +('testSite', 0, '2017-11-30 15:48:09'); + + + +INSERT INTO requestdb.activate_operational_env_service_model_distribution_status(OPERATIONAL_ENV_ID, SERVICE_MODEL_VERSION_ID, REQUEST_ID, SERVICE_MOD_VER_FINAL_DISTR_STATUS, RECOVERY_ACTION, RETRY_COUNT_LEFT, WORKLOAD_CONTEXT, CREATE_TIME, MODIFY_TIME) VALUES + ('1dfe7154-eae0-44f2-8e7a-8e5e7882e55d', '37305814-4949-45ce-ae24-c378c7ed07d1', '483646fe-36cc-4e90-895a-c472f6da3f74', 'DISTRIBUTION_COMPLETE_OK', 'RETRY', 0, 'VNF_D2D', '2018-02-02 18:44:27', '2018-02-02 18:45:06'), + ('1dfe7154-eae0-44f2-8e7a-8e5e7882e55d', '7bfa2197-8cbb-4080-b369-56c4d53c4573', '483646fe-36cc-4e90-895a-c472f6da3f74', 'DISTRIBUTION_COMPLETE_OK', 'SKIP', 0, 'VNF_D2D', '2018-02-02 18:44:27', '2018-02-02 18:44:56'); + +INSERT INTO requestdb.activate_operational_env_per_distributionid_status(DISTRIBUTION_ID, DISTRIBUTION_ID_STATUS, DISTRIBUTION_ID_ERROR_REASON, CREATE_TIME, MODIFY_TIME, OPERATIONAL_ENV_ID, SERVICE_MODEL_VERSION_ID, REQUEST_ID) VALUES + ('TEST_distributionId', 'DISTRIBUTION_COMPLETE_OK', NULL, '2018-02-02 18:44:27', '2018-02-02 18:44:56', '1dfe7154-eae0-44f2-8e7a-8e5e7882e55d', '7bfa2197-8cbb-4080-b369-56c4d53c4573', '483646fe-36cc-4e90-895a-c472f6da3f74'), + ('TEST_distributionId_2', 'DISTRIBUTION_COMPLETE_OK', NULL, '2018-02-02 18:44:27', '2018-02-02 18:45:06', '1dfe7154-eae0-44f2-8e7a-8e5e7882e55d', '37305814-4949-45ce-ae24-c378c7ed07d1', '483646fe-36cc-4e90-895a-c472f6da3f74'); + + +INSERT INTO requestdb.watchdog_distributionid_status(DISTRIBUTION_ID, DISTRIBUTION_ID_STATUS, CREATE_TIME, MODIFY_TIME) VALUES +('1533c4bd-a3e3-493f-a16d-28c20614415e', '', '2017-11-30 15:48:09', '2017-11-30 15:48:09'), +('55429711-809b-4a3b-9ee5-5120d46d9de0', '', '2017-11-30 16:35:36', '2017-11-30 16:35:36'), +('67f0b2d1-9013-4b2b-9914-bbe2288284fb', '', '2017-11-30 15:54:39', '2017-11-30 15:54:39'); + + + +INSERT INTO requestdb.watchdog_per_component_distribution_status(DISTRIBUTION_ID, COMPONENT_NAME, COMPONENT_DISTRIBUTION_STATUS, CREATE_TIME, MODIFY_TIME) VALUES +('1533c4bd-a3e3-493f-a16d-28c20614415e', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:48:09', '2017-11-30 15:48:09'), +('55429711-809b-4a3b-9ee5-5120d46d9de0', 'MSO', 'COMPONENT_DONE_ERROR', '2017-11-30 16:35:36', '2017-11-30 16:35:36'), +('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'MSO', 'COMPONENT_DONE_OK', '2017-11-30 15:54:39', '2017-11-30 15:54:39'); + + +INSERT INTO requestdb.watchdog_service_mod_ver_id_lookup(DISTRIBUTION_ID, SERVICE_MODEL_VERSION_ID, CREATE_TIME, MODIFY_TIME) VALUES +('1533c4bd-a3e3-493f-a16d-28c20614415e', '7e813ab5-88d3-4fcb-86c0-498c5d7eef9a', '2017-11-30 15:48:08', '2017-11-30 15:48:08'), +('55429711-809b-4a3b-9ee5-5120d46d9de0', 'cc031e75-4442-4d1a-b774-8a2b434e0a50', '2017-11-30 16:35:36', '2017-11-30 16:35:36'), +('67f0b2d1-9013-4b2b-9914-bbe2288284fb', 'eade1e9d-c1ec-4ef3-bc31-60570fba1573', '2017-11-30 15:54:39', '2017-11-30 15:54:39'); + +use catalogdb; +SET FOREIGN_KEY_CHECKS=0; + +INSERT INTO heat_files(ARTIFACT_UUID, NAME, VERSION, DESCRIPTION, BODY, ARTIFACT_CHECKSUM, CREATION_TIMESTAMP) VALUES +('00535bdd-0878-4478-b95a-c575c742bfb0', 'nimbus-ethernet-gw', '1', 'created from csar', 'DEVICE=$dev\nBOOTPROTO=none\nNM_CONTROLLED=no\nIPADDR=$ip\nNETMASK=$netmask\nGATEWAY=$gateway\n', 'MANUAL RECORD', '2017-01-21 23:56:43'); + + +INSERT INTO tosca_csar(ARTIFACT_UUID, NAME, VERSION, DESCRIPTION, ARTIFACT_CHECKSUM, URL, CREATION_TIMESTAMP) VALUES +('0513f839-459d-46b6-aa3d-2edfef89a079', 'service-Ciservicee3756aea561a-csar.csar', '1', 'TOSCA definition package of the asset', 'YTk1MmY2MGVlNzVhYTU4YjgzYjliMjNjMmM3NzU1NDc=', '/sdc/v1/catalog/services/Ciservicee3756aea561a/1.0/artifacts/service-Ciservicee3756aea561a-csar.csar', '2017-11-27 11:38:27'); + + +INSERT INTO service(MODEL_UUID, MODEL_NAME, MODEL_INVARIANT_UUID, MODEL_VERSION, DESCRIPTION, CREATION_TIMESTAMP, TOSCA_CSAR_ARTIFACT_UUID, SERVICE_TYPE, SERVICE_ROLE, ENVIRONMENT_CONTEXT, WORKLOAD_CONTEXT) VALUES +('5df8b6de-2083-11e7-93ae-92361f002671', 'Infra_v10_Service', '9647dfc4-2083-11e7-93ae-92361f002671', '1.0', 'MSO aLaCarte Vfmodule with addon', '2017-04-14 13:42:39', '0513f839-459d-46b6-aa3d-2edfef89a079', 'NA', 'NA', 'Luna', 'Oxygen'), +('5df8b6de-2083-11e7-93ae-92361f002672', 'Infra_v10_Service', '9647dfc4-2083-11e7-93ae-92361f002671', '2.0', 'MSO aLaCarte Vfmodule with addon', '2017-04-14 13:42:39', null, 'NA', 'NA', 'Luna', 'Oxygen'), +('f78914d9-423b-11e7-93f8-0050569a7965', 'VID_DEFAULT', 'f7ce78bb-423b-11e7-93f8-0050569a7965', '2.0', 'Default service for VID to use for infra APIH orchestration1707MIGRATED1707MIGRATED', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:05:05', NULL), +('f78914d9-423b-11e7-93f8-0050569a7966', 'ServiceInstanceTest', 'f7ce78bb-423b-11e7-93f8-0050569a7965', '1.0', 'ServiceInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('f78914d9-423b-11e7-93f8-0050569a7967', 'VnfInstanceTest', 'f7ce78bb-423b-11e7-93f8-0050569a7967', '1', 'VnfInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('f78914d9-423b-11e7-93f8-0050569a7968', 'VfModuleTest', 'f7ce78bb-423b-11e7-93f8-0050569a7968', '1', 'VfModule', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('f78914d9-423b-11e7-93f8-0050569a7969', 'NetworkInstanceTest', 'f7ce78bb-423b-11e7-93f8-0050569a7969', '1', 'NetworkInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('f78914d9-423b-11e7-93f8-0050569a7970', 'SDN-ETHERNET-INTERNET', 'f7ce78bb-423b-11e7-93f8-0050569a7969', '1', 'NetworkInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('5d48acb5-097d-4982-aeb2-f4a3bd87d31b', 'AssignInstance', '5d48acb5-097d-4982-aeb2-f4a3bd87d31b', '10.0', 'AssignInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL), +('ff3514e3-5a33-55df-13ab-12abad84e7ff', 'UnassignInstance', 'ff3514e3-5a33-55df-13ab-12abad84e7ff', '1.0', 'UnassignInstance', '2017-04-14 13:42:39', NULL, NULL, NULL, '2016-09-13 15:06:05', NULL); + + +INSERT INTO service_recipe(ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, SERVICE_PARAM_XSD, RECIPE_TIMEOUT, SERVICE_TIMEOUT_INTERIM, CREATION_TIMESTAMP, SERVICE_MODEL_UUID) VALUES +('1', 'createInstance', '1', 'Infra aLaCarte', '/mso/async/services/CreateGenericALaCarteServiceInstance', null, '180', '0', '2017-04-14 19:18:20', '5df8b6de-2083-11e7-93ae-92361f002671'), +('10', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateGenericALaCarteServiceInstance', NULL, '180', NULL, '2016-09-13 15:05:18', 'f78914d9-423b-11e7-93f8-0050569a7965'), +('11', 'activateInstance', '1', 'Activate ServiceInstance', '/mso/async/services/ActivateInstance', NULL, '120', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7966'), +('12', 'deactivateInstance', '1', 'Deactivate ServiceInstance', '/mso/async/services/DeactivateInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7966'), +('13', 'deleteInstance', '1', 'Delete ServiceInstance', '/mso/async/services/DeleteInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7966'), +('14', 'createInstance', '1', 'Create VnfInstance', '/mso/async/services/CreateVnfInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('15', 'replaceInstance', '1', 'Replace VnfInstance', '/mso/async/services/ReplaceVnfInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('16', 'updateInstance', '1', 'Update VnfInstance', '/mso/async/services/UpdateVnfInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('17', 'applyUpdatedConfig', '1', 'ApplyUpdatedConfig VnfInstance', '/mso/async/services/ApplyUpdatedConfig', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('18', 'deleteInstance', '1', 'Delete VnfInstance', '/mso/async/services/DeleteVnfInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('19', 'createInstance', '1', 'Create VfModule', '/mso/async/services/CreateVfModule', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7968'), +('20', 'createInstance', '1', 'Create NetworkInstance', '/mso/async/services/CreateNetworkInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'f78914d9-423b-11e7-93f8-0050569a7969'), +('36', 'assignInstance', '10.0', 'Assign ServiceInstance', '/mso/async/services/AssignServiceInstance', NULL, '180', NULL, '2016-09-13 15:06:18', '5d48acb5-097d-4982-aeb2-f4a3bd87d31b'), +('37', 'unassignInstance', '1.0', 'Unassign ServiceInstance', '/mso/async/services/UnassignServiceInstance', NULL, '180', NULL, '2016-09-13 15:06:18', 'ff3514e3-5a33-55df-13ab-12abad84e7ff'), +('41', 'createInstance', '1', 'Create ServiceRequest', '/mso/async/services/CreateMacroServiceNetworkVnf', null, '180', '0', '2017-04-14 19:18:20', '109a153e-325f-4df5-8161-edd91314daee'); + +INSERT INTO heat_template(ARTIFACT_UUID, NAME, VERSION, DESCRIPTION, BODY, TIMEOUT_MINUTES, ARTIFACT_CHECKSUM, CREATION_TIMESTAMP) VALUES +('ff874603-4222-11e7-9252-005056850d2e', 'module_mns_zrdm3frwl01exn_01_rgvm_1.yml', '1', 'created from csar', 'heat_template_version: 2013-05-23 description: heat template that creates TEST VNF parameters: TEST_server_name: type: string label: TEST server name description: TEST server name TEST_image_name: type: string label: image name description: TEST image name TEST_flavor_name: type: string label: TEST flavor name description: flavor name of TEST instance TEST_Role_net_name: type: string label: TEST network name description: TEST network name TEST_vnf_id: type: string label: TEST VNF Id description: TEST VNF Id resources:TEST: type: OS::Nova::Server properties: name: { get_param: TEST_server_name } image: { get_param: TEST_image_name } flavor: { get_param: TEST_flavor_name } networks: - port: { get_resource: TEST_port_0} metadata: vnf_id: {get_param: TEST_vnf_id} TEST_port_0: type: OS::Neutron::Port properties: network: { get_param: TEST_Role_net_name }', '60', 'MANUAL RECORD', '2017-01-21 23:26:56'), +('ff87482f-4222-11e7-9252-005056850d2e', 'module_mns_zrdm3frwl01exn_01_rgvm_1.yml', '1', 'created from csar', 'heat_template_version: 2013-05-23 description: heat template that creates TEST VNF parameters: TEST_server_name: type: string label: TEST server name description: TEST server name TEST_image_name: type: string label: image name description: TEST image name TEST_flavor_name: type: string label: TEST flavor name description: flavor name of TEST instance TEST_Role_net_name: type: string label: TEST network name description: TEST network name TEST_vnf_id: type: string label: TEST VNF Id description: TEST VNF Id resources:TEST: type: OS::Nova::Server properties: name: { get_param: TEST_server_name } image: { get_param: TEST_image_name } flavor: { get_param: TEST_flavor_name } networks: - port: { get_resource: TEST_port_0} metadata: vnf_id: {get_param: TEST_vnf_id} TEST_port_0: type: OS::Neutron::Port properties: network: { get_param: TEST_Role_net_name }', '60', 'MANUAL RECORD', '2017-01-21 23:26:56'), +('aa874603-4222-11e7-9252-005056850d2e', 'module_mns_zrdm3frwl01exn_01_rgvm_1.yml', '1', 'created from csar', 'heat_template_version: 2013-05-23 description: heat template that creates TEST VNF parameters: TEST_server_name: type: string label: TEST server name description: TEST server name TEST_image_name: type: string label: image name description: TEST image name TEST_flavor_name: type: string label: TEST flavor name description: flavor name of TEST instance TEST_Role_net_name: type: string label: TEST network name description: TEST network name TEST_vnf_id: type: string label: TEST VNF Id description: TEST VNF Id resources:TEST: type: OS::Nova::Server properties: name: { get_param: TEST_server_name } image: { get_param: TEST_image_name } flavor: { get_param: TEST_flavor_name } networks: - port: { get_resource: TEST_port_0} metadata: vnf_id: {get_param: TEST_vnf_id} TEST_port_0: type: OS::Neutron::Port properties: network: { get_param: TEST_Role_net_name }', '60', 'MANUAL RECORD', '2017-01-21 23:26:56'); + + +INSERT INTO heat_template_params(HEAT_TEMPLATE_ARTIFACT_UUID, PARAM_NAME, IS_REQUIRED, PARAM_TYPE, PARAM_ALIAS) VALUES +('ff874603-4222-11e7-9252-005056850d2e', 'availability_zone_0', 1, 'string', ''), +('ff874603-4222-11e7-9252-005056850d2e', 'exn_direct_net_fqdn', 1, 'string', ''), +('ff874603-4222-11e7-9252-005056850d2e', 'exn_hsl_net_fqdn', 1, 'string', ''); + + +INSERT INTO heat_environment(ARTIFACT_UUID, NAME, VERSION, DESCRIPTION, BODY, ARTIFACT_CHECKSUM, CREATION_TIMESTAMP) VALUES +('fefb1601-4222-11e7-9252-005056850d2e', 'module_nso.env', '2', 'Auto-generated HEAT Environment deployment artifact', 'parameters:\n availability_zone_0: \"alln-zone-1\"\n nso_flavor_name: \"citeis.1vCPUx2GB\"\n nso_image_name: \"RHEL-6.8-BASE-20160912\"\n nso_name_0: \"zrdm3vamp01nso001\"\n nso_oam_ip_0: \"172.18.25.175\"\n nso_oam_net_gw: \"172.18.25.1\"\n nso_oam_net_mask: \"255.255.255.0\"\n nso_sec_grp_id: \"36f48d82-f099-4437-bfbc-70d9e5d420d1\"\n nso_srv_grp_id: \"e431c477-5bd1-476a-bfa9-e4ce16b8356b\"\n oam_net_id: \"nso_oam\"\n vf_module_id: \"145cd730797234b4a40aa99335abc143\"\n vnf_id: \"730797234b4a40aa99335157b02871cd\"\n vnf_name: \"Mobisupport\"\n', 'MWI2ODY0Yjc1NDJjNWU1NjdkMTAyMjVkNzFmZDU0MzA=', '2017-11-27 08:42:58'), +('fefb1751-4333-11e7-9252-005056850d2e', 'module_nso.env', '2', 'Auto-generated HEAT Environment deployment artifact', 'parameters:\n availability_zone_0: \"alln-zone-1\"\n nso_flavor_name: \"citeis.1vCPUx2GB\"\n nso_image_name: \"RHEL-6.8-BASE-20160912\"\n nso_name_0: \"zrdm3vamp01nso001\"\n nso_oam_ip_0: \"172.18.25.175\"\n nso_oam_net_gw: \"172.18.25.1\"\n nso_oam_net_mask: \"255.255.255.0\"\n nso_sec_grp_id: \"36f48d82-f099-4437-bfbc-70d9e5d420d1\"\n nso_srv_grp_id: \"e431c477-5bd1-476a-bfa9-e4ce16b8356b\"\n oam_net_id: \"nso_oam\"\n vf_module_id: \"145cd730797234b4a40aa99335abc143\"\n vnf_id: \"730797234b4a40aa99335157b02871cd\"\n vnf_name: \"Mobisupport\"\n', 'MWI2ODY0Yjc1NDJjNWU1NjdkMTAyMjVkNzFmZDU0MzA=', '2017-11-27 08:42:58'); + +INSERT INTO vnf_resource(ORCHESTRATION_MODE, DESCRIPTION, CREATION_TIMESTAMP, MODEL_UUID, AIC_VERSION_MIN, AIC_VERSION_MAX, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, TOSCA_NODE_TYPE, HEAT_TEMPLATE_ARTIFACT_UUID) VALUES +('HEAT', '1607 v10 - inherent network', '2017-04-14 21:46:28', 'ff2ae348-214a-11e7-93ae-92361f002672', '', '', '2fff5b20-214b-11e7-93ae-92361f002671', '2.0', 'v10', 'VF', null), +('HEAT', '1607 v10 - inherent network', '2017-04-14 21:46:28', 'fe6478e4-ea33-3346-ac12-ab121484a3fe', '', '', 'ff5256d1-5a33-55df-13ab-12abad84e7ff', '2.0', 'v12', 'VF', null), +('HEAT', '1607 v10 - inherent network', '2017-04-14 21:46:28', 'ff2ae348-214a-11e7-93ae-92361f002671', '', '', '2fff5b20-214b-11e7-93ae-92361f002671', '1.0', 'v10', 'VF', null), +('HEAT', '1607 vSAMP10a - inherent network', '2017-04-14 21:46:28', 'fe6478e4-ea33-3346-ac12-ab121484a3fw', '', '', '2fff5b20-214b-11e7-93ae-92361f002671', '1.0', 'vSAMP10a', 'VF', null); + +INSERT INTO vnf_resource_customization(MODEL_CUSTOMIZATION_UUID, MODEL_INSTANCE_NAME, MIN_INSTANCES, MAX_INSTANCES, AVAILABILITY_ZONE_MAX_COUNT, NF_TYPE, NF_ROLE, NF_FUNCTION, NF_NAMING_CODE, CREATION_TIMESTAMP, VNF_RESOURCE_MODEL_UUID, MULTI_STAGE_DESIGN) VALUES +('68dc9a92-214c-11e7-93ae-92361f002671', 'v10 1', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002671', null), +('f78914d9-423b-11e7-93f8-0050569a7967', 'test', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'f78914d9-423b-11e7-93f8-0050569a7967', null), +('68dc9a92-214c-11e7-93ae-92361f002672', 'test', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'ff2ae348-214a-11e7-93ae-92361f002672', null), +('68dc9a92-214c-11e7-93ae-92361f002673', 'test', '0', '0', '0', 'vSAMP', 'vSAMP', 'vSAMP', 'vSAMP', '2017-05-26 15:08:24', 'fe6478e4-ea33-3346-ac12-ab121484a3fe', null), +('68dc9a92-214c-11e7-93ae-92361f002674', 'test', '0', '0', '0', '', 'TEST', '', '', '2017-05-26 15:08:24', 'fe6478e4-ea33-3346-ac12-ab121484a3fw', null); + + + +INSERT INTO vf_module(MODEL_UUID, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, DESCRIPTION, IS_BASE, HEAT_TEMPLATE_ARTIFACT_UUID, VOL_HEAT_TEMPLATE_ARTIFACT_UUID, CREATION_TIMESTAMP, VNF_RESOURCE_MODEL_UUID) VALUES + +('20c4431c-246d-11e7-93ae-92361f002671', '78ca26d0-246d-11e7-93ae-92361f002671', '2', 'test::base::module-0', 'v10 DEV Base', '1', 'ff874603-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002671'), +('066de97e-253e-11e7-93ae-92361f002671', '64efd51a-2544-11e7-93ae-92361f002671', '2', 'test::PCM::module-1', 'v10 DEV PCM', '0', 'ff87482f-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002671'); + + +INSERT INTO vf_module_customization(MODEL_CUSTOMIZATION_UUID, LABEL, INITIAL_COUNT, MIN_INSTANCES, MAX_INSTANCES, AVAILABILITY_ZONE_COUNT, HEAT_ENVIRONMENT_ARTIFACT_UUID, VOL_ENVIRONMENT_ARTIFACT_UUID, CREATION_TIMESTAMP, VF_MODULE_MODEL_UUID) VALUES +('cb82ffd8-252a-11e7-93ae-92361f002671', 'base', '1', '0', '0', '0', 'fefb1601-4222-11e7-9252-005056850d2e', null, '2017-05-26 15:08:23', '20c4431c-246d-11e7-93ae-92361f002671'), +('b4ea86b4-253f-11e7-93ae-92361f002671', 'PCM', '0', '0', '0', '0', 'fefb1751-4333-11e7-9252-005056850d2e', null, '2017-05-26 15:08:23', '066de97e-253e-11e7-93ae-92361f002671'); + + +INSERT INTO vnf_res_custom_to_vf_module_custom(VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID, VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID, CREATION_TIMESTAMP) VALUES +('68dc9a92-214c-11e7-93ae-92361f002671', 'cb82ffd8-252a-11e7-93ae-92361f002671', '2017-05-26 15:08:24'), +('68dc9a92-214c-11e7-93ae-92361f002671', 'b4ea86b4-253f-11e7-93ae-92361f002671', '2017-05-26 15:08:24'); + +INSERT INTO allotted_resource(MODEL_UUID, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, TOSCA_NODE_TYPE, SUBCATEGORY, DESCRIPTION, CREATION_TIMESTAMP) VALUES +('f6b7d4c6-e8a4-46e2-81bc-31cad5072842', 'b7a1b78e-6b6b-4b36-9698-8c9530da14af', '1.0', 'Tunnel_Xconn', '', '', '', '2017-05-26 15:08:24'); + +INSERT INTO allotted_resource_customization(MODEL_CUSTOMIZATION_UUID, MODEL_INSTANCE_NAME, PROVIDING_SERVICE_MODEL_INVARIANT_UUID, TARGET_NETWORK_ROLE, NF_TYPE, NF_ROLE, NF_FUNCTION, NF_NAMING_CODE, MIN_INSTANCES, MAX_INSTANCES, AR_MODEL_UUID, CREATION_TIMESTAMP) VALUES +('367a8ba9-057a-4506-b106-fbae818597c6', 'Sec_Tunnel_Xconn 11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'f6b7d4c6-e8a4-46e2-81bc-31cad5072842', TIMESTAMP '2017-01-20 16:14:20.0'); + + +INSERT INTO network_resource(MODEL_UUID, MODEL_NAME, MODEL_INVARIANT_UUID, DESCRIPTION, HEAT_TEMPLATE_ARTIFACT_UUID, NEUTRON_NETWORK_TYPE, MODEL_VERSION, TOSCA_NODE_TYPE, AIC_VERSION_MIN, AIC_VERSION_MAX, ORCHESTRATION_MODE, CREATION_TIMESTAMP) VALUES +('10b36f65-f4e6-4be6-ae49-9596dc1c47fc', 'CONTRAIL30_GNDIRECT', 'ce4ff476-9641-4e60-b4d5-b4abbec1271d', 'Contrail 30 GNDIRECT NW', 'aa874603-4222-11e7-9252-005056850d2e', 'BASIC', '1.0', '', '3.0', '', 'HEAT', '2017-01-17 20:35:05'); + +INSERT INTO network_resource_customization(MODEL_CUSTOMIZATION_UUID, MODEL_INSTANCE_NAME, NETWORK_TECHNOLOGY, NETWORK_TYPE, NETWORK_ROLE, NETWORK_SCOPE, CREATION_TIMESTAMP, NETWORK_RESOURCE_MODEL_UUID) VALUES +('3bdbb104-476c-483e-9f8b-c095b3d308ac', 'CONTRAIL30_GNDIRECT 9', '', '', '', '', '2017-04-19 14:28:32', '10b36f65-f4e6-4be6-ae49-9596dc1c47fc'); + +--second service insert + + + + + +INSERT INTO vf_module(MODEL_UUID, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, DESCRIPTION, IS_BASE, HEAT_TEMPLATE_ARTIFACT_UUID, VOL_HEAT_TEMPLATE_ARTIFACT_UUID, CREATION_TIMESTAMP, VNF_RESOURCE_MODEL_UUID) VALUES + +('20c4431c-246d-11e7-93ae-92361f002672', '78ca26d0-246d-11e7-93ae-92361f002671', '2', 'test::base::module-0', 'v10 DEV Base', '1', 'ff874603-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002671'), +('066de97e-253e-11e7-93ae-92361f002672', '64efd51a-2544-11e7-93ae-92361f002671', '2', 'test::PCM::module-1', 'v10 DEV PCM', '0', 'ff87482f-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002671'), +('test', '64efd51a-2544-11e7-93ae-92361f002671', '2', 'test::PCM::module-1', 'v10 DEV PCM', '1', 'ff87482f-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002672'), +('test1', 'b4ea86b4-253f-11e7-93ae-92361f002672', '2', 'test::PCM::module-1', 'v10 DEV PCM', '1', 'ff87482f-4222-11e7-9252-005056850d2e', null, '2016-09-14 18:19:56', 'ff2ae348-214a-11e7-93ae-92361f002672'); + +INSERT INTO vf_module_customization(MODEL_CUSTOMIZATION_UUID, LABEL, INITIAL_COUNT, MIN_INSTANCES, MAX_INSTANCES, AVAILABILITY_ZONE_COUNT, HEAT_ENVIRONMENT_ARTIFACT_UUID, VOL_ENVIRONMENT_ARTIFACT_UUID, CREATION_TIMESTAMP, VF_MODULE_MODEL_UUID) VALUES +('cb82ffd8-252a-11e7-93ae-92361f002672', 'base', '1', '0', '0', '0', 'fefb1601-4222-11e7-9252-005056850d2e', null, '2017-05-26 15:08:23', '20c4431c-246d-11e7-93ae-92361f002672'), +('b4ea86b4-253f-11e7-93ae-92361f002672', 'PCM', '0', '0', '0', '0', 'fefb1751-4333-11e7-9252-005056850d2e', null, '2017-05-26 15:08:23', '066de97e-253e-11e7-93ae-92361f002672'); + + +INSERT INTO vnf_res_custom_to_vf_module_custom(VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID, VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID, CREATION_TIMESTAMP) VALUES +('68dc9a92-214c-11e7-93ae-92361f002672', 'cb82ffd8-252a-11e7-93ae-92361f002672', '2017-05-26 15:08:24'), +('68dc9a92-214c-11e7-93ae-92361f002672', 'b4ea86b4-253f-11e7-93ae-92361f002672', '2017-05-26 15:08:24'), +('68dc9a92-214c-11e7-93ae-92361f002673', 'b4ea86b4-253f-11e7-93ae-92361f002672', '2017-05-26 15:08:24'); + + +INSERT INTO vf_module_to_heat_files(VF_MODULE_MODEL_UUID, HEAT_FILES_ARTIFACT_UUID) VALUES +('20c4431c-246d-11e7-93ae-92361f002671', '00535bdd-0878-4478-b95a-c575c742bfb0'), +('066de97e-253e-11e7-93ae-92361f002671', '00535bdd-0878-4478-b95a-c575c742bfb0'); + + +insert into network_resource_customization_to_service(service_model_uuid, resource_model_customization_uuid) values +('5df8b6de-2083-11e7-93ae-92361f002671', '3bdbb104-476c-483e-9f8b-c095b3d308ac'), +('5df8b6de-2083-11e7-93ae-92361f002672', '3bdbb104-476c-483e-9f8b-c095b3d308ac'); + + +insert into vnf_resource_customization_to_service(service_model_uuid, resource_model_customization_uuid) values +('5df8b6de-2083-11e7-93ae-92361f002671', '68dc9a92-214c-11e7-93ae-92361f002671'), +('f78914d9-423b-11e7-93f8-0050569a7965', 'f78914d9-423b-11e7-93f8-0050569a7967'), +('5df8b6de-2083-11e7-93ae-92361f002672', '68dc9a92-214c-11e7-93ae-92361f002672'); + +insert into allotted_resource_customization_to_service(service_model_uuid, resource_model_customization_uuid) values +('5df8b6de-2083-11e7-93ae-92361f002671', '367a8ba9-057a-4506-b106-fbae818597c6'), +('5df8b6de-2083-11e7-93ae-92361f002672', '367a8ba9-057a-4506-b106-fbae818597c6'); + + +INSERT INTO vnf_recipe(ID, nf_role, ACTION, SERVICE_TYPE, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, VNF_PARAM_XSD, RECIPE_TIMEOUT, CREATION_TIMESTAMP, VF_MODULE_ID) VALUES +('77', 'VID_DEFAULT', 'createInstance', '', '1', 'VID_DEFAULT recipe to create VNF if no custom BPMN flow is found', '/mso/async/services/CreateVnfInfra', '', '180', '2016-09-14 19:18:20', ''), +('78', 'VID_DEFAULT', 'deleteInstance', '', '1', 'VID_DEFAULT recipe to delete VNF if no custom BPMN flow is found', '/mso/async/services/DeleteVnfInfra', '', '180', '2016-09-14 19:18:20', ''), +('81', 'VID_DEFAULT', 'updateInstance', '', '1', 'VID_DEFAULT update', '/mso/async/services/UpdateVnfInfra', '', '180', '2017-07-28 18:19:39', ''), +('85', 'VID_DEFAULT', 'replaceInstance', '', '1', 'VID_DEFAULT replace', '/mso/async/services/ReplaceVnfInfra', 'VID_DEFAULT', '180', '2017-07-28 18:19:45', ''), +('10000', 'VID_DEFAULT', 'inPlaceSoftwareUpdate', '', '1', 'VID_DEFAULT inPlaceSoftwareUpdate', '/mso/async/services/VnfInPlaceUpdate', '', '180', '2017-10-25 18:19:45', ''), +('10001', 'VID_DEFAULT', 'applyUpdatedConfig', '', '1', 'VID_DEFAULT applyUpdatedConfig', '/mso/async/services/VnfConfigUpdate', '', '180', '2017-10-25 18:19:45', ''), + + +('13', 'CREATE', 'createInstance', 'VID_DEFAULT', '1', 'Create VnfInstance', '/mso/async/services/CreateVnf', '', '180', '2016-06-03 10:14:10', '1882934'), +('14', 'REPLACE', 'replaceInstance', 'VID_DEFAULT', '1', 'Replace VnfInstance', '/mso/async/services/ReplaceVnf', '', '180', '2016-06-03 10:14:10', '1882934'), +('15', 'UPDATE', 'updateInstance', 'VID_DEFAULT', '1', 'Update VnfInstance', '/mso/async/services/UpdateVnf', '', '180', '2016-06-03 10:14:10', '1882934'), +('16', 'DEFAULT', 'applyUpdatedConfig', 'VID_DEFAULT', '1', 'Default VnfInstance', '/mso/async/services/DefaultVnfUri', '', '180', '2016-06-03 10:14:10', '1882934'), +('17', 'DEFAULT', 'inPlaceSoftwareUpdate', 'VID_DEFAULT', '1', 'Default VnfInstance', '/mso/async/services/DefaultVnfUri', '', '180', '2016-06-03 10:14:10', '1882934'), +('20', 'DELETE', 'deleteInstance', 'VID_DEFAULT', '1', 'Delete VnfInstance', '/mso/async/services/DeleteVnf', '', '180', '2016-06-03 10:14:10', '1882934'), +('21', 'TEST', 'replaceInstance', 'VID_DEFAULT', '2', 'custom bpmn for vnf recreate', '/mso/async/services/RecreateInfraVce', '', '180', '2016-06-03 10:14:10', '1882934'); + +INSERT INTO vnf_components(VNF_ID, COMPONENT_TYPE, HEAT_TEMPLATE_ID, HEAT_ENVIRONMENT_ID, CREATION_TIMESTAMP) VALUES +('13961', 'VOLUME', '13843', '13961', '2016-05-19 20:22:02'); + +INSERT INTO vnf_components_recipe(ID, VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, SERVICE_TYPE, VERSION, DESCRIPTION, ORCHESTRATION_URI, VNF_COMPONENT_PARAM_XSD, RECIPE_TIMEOUT, CREATION_TIMESTAMP, VF_MODULE_MODEL_UUID) VALUES +('5', '*', 'VOLUME_GROUP', 'CREATE', '', '1', 'Recipe Match All for VF Modules if no custom flow exists', '/mso/async/services/createCinderVolumeV1', '', '180', '2016-06-03 10:15:11', ''), +('7', '*', 'VOLUME_GROUP', 'DELETE', '', '1', 'Recipe Match All for VF Modules if no custom flow exists', '/mso/async/services/deleteCinderVolumeV1', '', '180', '2016-06-03 10:15:11', ''), +('9', '*', 'VOLUME_GROUP', 'UPDATE', '', '1', 'Recipe Match All for VF Modules if no custom flow exists', '/mso/async/services/updateCinderVolumeV1', '', '180', '2016-06-03 10:15:11', ''), +('13', '', 'VOLUME_GROUP', 'DELETE_VF_MODULE_VOL', '', '1', 'Recipe Match All for VF Modules if no custom flow exists', '/mso/async/services/DeleteVfModuleVolume', '', '180', '2016-06-03 10:15:11', '*'), +('15', '', 'VOLUME_GROUP', 'UPDATE_VF_MODULE_VOL', '', '1', 'Recipe Match All for VF Modules if no custom flow exists', '/mso/async/services/UpdateVfModuleVolume', '', '180', '2016-06-03 10:15:11', '*'), +('16', 'volumeGroup', 'volumeGroup', 'createInstance', '', '1', 'VID_DEFAULT recipe to create volume-group if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleVolumeInfraV1', '', '180', '2016-09-14 19:18:20', 'VID_DEFAULT'), +('17', 'volumeGroup', 'volumeGroup', 'deleteInstance', '', '1', 'VID_DEFAULT recipe to delete volume-group if no custom BPMN flow is found', '/mso/async/services/DeleteVfModuleVolumeInfraV1', '', '180', '2016-09-14 19:18:20', 'VID_DEFAULT'), +('18', 'volumeGroup', 'volumeGroup', 'updateInstance', '', '1', 'VID_DEFAULT recipe to update volume-group if no custom BPMN flow is found', '/mso/async/services/UpdateVfModuleVolumeInfraV1', '', '180', '2016-09-14 19:18:20', 'VID_DEFAULT'), +('19', 'vfModule', 'vfModule', 'createInstance', '', '1', 'VID_DEFAULT recipe to create vf-module if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleInfra', '', '180', '2016-09-14 19:18:20', '20c4431c-246d-11e7-93ae-92361f002672'), +('20', 'vfModule', 'vfModule', 'deleteInstance', '', '1', 'VID_DEFAULT recipe to delete vf-module if no custom BPMN flow is found', '/mso/async/services/DeleteVfModuleInfra', '', '180', '2016-09-14 19:18:20', 'VID_DEFAULT'), +('21', 'vfModule', 'vfModule', 'updateInstance', '', '1', 'VID_DEFAULT recipe to update vf-module if no custom BPMN flow is found', '/mso/async/services/UpdateVfModuleInfra', '', '180', '2016-09-14 19:18:20', 'VID_DEFAULT'), +('25', 'vfModule', 'vfModule', 'replaceInstance', '', '1', 'VID_DEFAULT vfModule replace', '/mso/async/services/ReplaceVfModuleInfra', '', '180', '2017-07-28 18:25:06', 'VID_DEFAULT'); + + +INSERT INTO catalogdb.network_recipe(ID, MODEL_NAME, ACTION, DESCRIPTION, ORCHESTRATION_URI, NETWORK_PARAM_XSD, RECIPE_TIMEOUT, SERVICE_TYPE, CREATION_TIMESTAMP, VERSION_STR) VALUES +('17', 'VID_DEFAULT', 'createInstance', 'VID_DEFAULT recipe to create network if no custom BPMN flow is found', '/mso/async/services/CreateNetworkInstance', '', '180', '', '2016-09-14 19:18:20', '1.0'), +('18', 'VID_DEFAULT', 'updateInstance', 'VID_DEFAULT recipe to update network if no custom BPMN flow is found', '/mso/async/services/UpdateNetworkInstance', '', '180', '', '2016-09-14 19:18:20', '1.0'), +('19', 'VID_DEFAULT', 'deleteInstance', 'VID_DEFAULT recipe to delete network if no custom BPMN flow is found', '/mso/async/services/DeleteNetworkInstance', '', '180', '', '2016-09-14 19:18:20', '1.0'), +('14', 'tester', 'createInstance', '', '/mso/async/services/CreateNetwork', '', '180', '', '2017-09-22 18:47:31', '1'), +('15', 'tester', 'updateInstance', '', '/mso/async/services/UpdateNetwork', '', '180', '', '2017-09-22 18:47:31', '1'), +('16', 'tester', 'deleteInstance', '', '/mso/async/services/DeleteNetwork', '', '180', '', '2017-09-22 18:47:31', '1'); + +INSERT INTO vnf_recipe (nf_role, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) +VALUES +('GR-API-DEFAULT', 'createInstance', '1', 'Gr api recipe to create vnf', '/mso/async/services/WorkflowActionBB', 180), +('GR-API-DEFAULT', 'deleteInstance', '1', 'Gr api recipe to delete vnf', '/mso/async/services/WorkflowActionBB', 180), +('GR-API-DEFAULT', 'updateInstance', '1', 'Gr api recipe to update vnf', '/mso/async/services/WorkflowActionBB', 180), +('GR-API-DEFAULT', 'replaceInstance', '1', 'Gr api recipe to replace vnf', '/mso/async/services/WorkflowActionBB', 180), +('GR-API-DEFAULT', 'inPlaceSoftwareUpdate', '1', 'Gr api recipe to do an in place software update', '/mso/async/services/VnfInPlaceUpdate', 180), +('GR-API-DEFAULT', 'applyUpdatedConfig', '1', 'Gr api recipe to apply updated config', '/mso/async/services/VnfConfigUpdate', 180); + +UPDATE vnf_recipe +SET nf_role = 'VNF-API-DEFAULT' +WHERE nf_role = 'VID_DEFAULT'; + +INSERT INTO service (MODEL_UUID, MODEL_NAME, MODEL_INVARIANT_UUID, MODEL_VERSION, DESCRIPTION) +VALUES +('d88da85c-d9e8-4f73-b837-3a72a431622b', 'GR-API-DEFAULT', '944862ae-bb65-4429-8330-a6c9170d6672', '1.0', 'Gr api service for VID to use for infra APIH orchestration'); + +UPDATE service +SET model_name = 'VNF-API-DEFAULT' +WHERE model_name = 'VID_DEFAULT'; + +INSERT INTO service_recipe (ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, SERVICE_MODEL_UUID) +VALUES +('activateInstance', '1.0', 'Gr api recipe to activate service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'), +('createInstance', '1.0', 'Gr api recipe to create service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'), +('deactivateInstance', '1.0', 'Gr api recipe to deactivate service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'), +('deleteInstance', '1.0', 'Gr api recipe to delete service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'), +('assignInstance', '1.0', 'Gr api recipe to assign service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'), +('unassignInstance', '1.0', 'Gr api recipe to unassign service-instance', '/mso/async/services/WorkflowActionBB', 180, 'd88da85c-d9e8-4f73-b837-3a72a431622b'); + +INSERT INTO vnf_components_recipe (VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_MODEL_UUID) +VALUES +('volumeGroup', 'createInstance', '1', 'Gr api recipe to create volume-group', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('volumeGroup', 'deleteInstance', '1', 'Gr api recipe to delete volume-group', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('volumeGroup', 'updateInstance', '1', 'Gr api recipe to update volume-group', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('vfModule', 'createInstance', '1', 'Gr api recipe to create vf-module', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('vfModule', 'deleteInstance', '1', 'Gr api recipe to delete vf-module', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('vfModule', 'updateInstance', '1', 'Gr api recipe to update vf-module', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('vfModule', 'replaceInstance', '1', 'Gr api recipe to replace vf-module', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'), +('vfModule', 'deactivateAndCloudDelete', '1', 'Gr api recipe to deactivateAndCloudDelete vf-module', '/mso/async/services/WorkflowActionBB', 180, 'GR-API-DEFAULT'); + +UPDATE vnf_components_recipe +SET vf_module_model_uuid = 'VNF-API-DEFAULT' +WHERE vf_module_model_uuid = 'VID_DEFAULT'; + +INSERT INTO network_recipe (MODEL_NAME, ACTION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VERSION_STR) +VALUES +('GR-API-DEFAULT', 'createInstance', 'Gr api recipe to create network', '/mso/async/services/WorkflowActionBB', 180, '1.0'), +('GR-API-DEFAULT', 'updateInstance', 'Gr api recipe to update network', '/mso/async/services/WorkflowActionBB', 180, '1.0'), +('GR-API-DEFAULT', 'deleteInstance', 'Gr api recipe to delete network', '/mso/async/services/WorkflowActionBB', 180, '1.0'); + +UPDATE network_recipe +SET model_name = 'VNF-API-DEFAULT' +WHERE model_name = 'VID_DEFAULT';
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/logback-test.xml b/mso-api-handlers/mso-api-handler-infra/src/test/resources/logback-test.xml index 4609de0d77..1b3a7cc6da 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/logback-test.xml +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/logback-test.xml @@ -1,28 +1,39 @@ <configuration > - + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}||%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n</pattern> + <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + </pattern> </encoder> </appender> + <appender name="test" class="org.onap.so.apihandlerinfra.TestAppender"/> + - - <logger name="com.att.ecomp.audit" level="debug" additivity="false"> + <logger name="AUDIT" level="info" additivity="false"> <appender-ref ref="STDOUT" /> + <appender-ref ref = "test" /> </logger> <logger name="com.att.eelf.metrics" level="info" additivity="false"> <appender-ref ref="STDOUT" /> </logger> - <logger name="com.att.eelf.error" level="debug" additivity="false"> + <logger name="com.att.eelf.error" level="ERROR" additivity="false"> <appender-ref ref="STDOUT" /> </logger> - <root level="debug"> + <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false"> + <appender-ref ref="STDOUT" /> + </logger> + + <logger name="com.att" level="${so.log.level:-DEBUG}" additivity="false"> + <appender-ref ref="STDOUT" /> + </logger> + <root level="WARN"> <appender-ref ref="STDOUT" /> </root> - + + <logger name="wiremock.org" level="ERROR" /> </configuration>
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/logging.properties b/mso-api-handlers/mso-api-handler-infra/src/test/resources/logging.properties deleted file mode 100644 index 4941c55971..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/logging.properties +++ /dev/null @@ -1,2 +0,0 @@ -#register SLF4JBridgeHandler as handler for the j.u.l. root logger -handlers = org.slf4j.bridge.SLF4JBridgeHandler diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties b/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties deleted file mode 100644 index bc07142254..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties +++ /dev/null @@ -1,37 +0,0 @@ -# This is a chef generated properties file! Manual updates will be overridden next chef-client run, ensure desired changes are in mso-config chef cookbook or chef env file. -bpelURL=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/ -bpelAuth=786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1 -camundaURL=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080 -camundaAuth=F8E9452B55DDE4CCE77547B0E748105C54CF5EF1351B4E2CBAABF2981EFE776D - -# controls what actions the infra API (APIH) allows sent in on REST request -vnf.v1.ApiAllowableActions= -vnf.v2.ApiAllowableActions=DELETE_VF_MODULE,UPDATE_VF_MODULE -vnf.v3.ApiAllowableActions=CREATE_VF_MODULE,DELETE_VF_MODULE,UPDATE_VF_MODULE -network.v1.ApiAllowableActions=DELETE,UPDATE -network.v2.ApiAllowableActions=DELETE,UPDATE -network.v3.ApiAllowableActions=CREATE,DELETE,UPDATE -volume.v1.ApiAllowableActions= -volume.v2.ApiAllowableActions=DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL -volume.v3.ApiAllowableActions=CREATE_VF_MODULE_VOL,DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL -mso.infra.default.alacarte.orchestrationUri=/mso/async/services/ALaCarteOrchestrator -mso.infra.default.alacarte.recipeTimeout=180 - -# Added these properties for Dmaap client for Tenant Isolation -so.operational-environment.dmaap.username=m97898@mso.ecomp.att.com -so.operational-environment.dmaap.password=VjR5NDcxSzA= -so.operational-environment.dmaap.host=https://dcae-mrtr-ftl3.ecomp.cci.att.com:3905 -so.operational-environment.publisher.topic=com.att.ecomp.mso.operationalEnvironmentEvent - -# tenant isolation -asdc.activate.instanceid=test -asdc.activate.userid=cs0008 -mso.asdc.client.auth=F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862 -mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7 -mso.tenant.isolation.retry.count=3 -asdc.endpoint=http://localhost:28090 -aai.auth=757A94191D685FD2092AC1490730A4FC -aai.endpoint=http://localhost:28090 -grm.endpoint=http://localhost:28090 -grm.username=gmruser -grm.password=cGFzc3dvcmQ= diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/ecomp-openv-request.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/onap/so/client/asdc/create-ecompoe/ecomp-openv-request.json index a73302ef04..a73302ef04 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/ecomp-openv-request.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/onap/so/client/asdc/create-ecompoe/ecomp-openv-request.json diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql new file mode 100644 index 0000000000..3540110351 --- /dev/null +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql @@ -0,0 +1,993 @@ +--------START Catalog DB SCHEMA -------- +use catalogdb; + +create table `allotted_resource` ( + `model_uuid` varchar(200) not null, + `model_invariant_uuid` varchar(200) not null, + `model_version` varchar(20) not null, + `model_name` varchar(200) not null, + `tosca_node_type` varchar(200) default null, + `subcategory` varchar(200) default null, + `description` varchar(1200) default null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`model_uuid`) +) engine=innodb default charset=latin1; + + + + +create table `allotted_resource_customization` ( + `model_customization_uuid` varchar(200) not null, + `model_instance_name` varchar(200) not null, + `providing_service_model_uuid` varchar(200) default null, + `providing_service_model_invariant_uuid` varchar(200) default null, + `providing_service_model_name` varchar(200) default null, + `target_network_role` varchar(200) default null, + `nf_type` varchar(200) default null, + `nf_role` varchar(200) default null, + `nf_function` varchar(200) default null, + `nf_naming_code` varchar(200) default null, + `min_instances` int(11) default null, + `max_instances` int(11) default null, + `ar_model_uuid` varchar(200) not null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`model_customization_uuid`), + key `fk_allotted_resource_customization__allotted_resource1_idx` (`ar_model_uuid`), + constraint `fk_allotted_resource_customization__allotted_resource1` foreign key (`ar_model_uuid`) references `allotted_resource` (`model_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + + +create table `heat_environment` ( + `artifact_uuid` varchar(200) not null, + `name` varchar(100) not null, + `version` varchar(20) not null, + `description` varchar(1200) default null, + `body` longtext not null, + `artifact_checksum` varchar(200) not null default 'manual record', + `creation_timestamp` datetime not null default current_timestamp, + primary key (`artifact_uuid`) +) engine=innodb default charset=latin1; + + + +create table `heat_files` ( + `artifact_uuid` varchar(200) not null, + `name` varchar(200) not null, + `version` varchar(20) not null, + `description` varchar(1200) default null, + `body` longtext not null, + `artifact_checksum` varchar(200) not null default 'manual record', + `creation_timestamp` datetime not null default current_timestamp, + primary key (`artifact_uuid`) +) engine=innodb default charset=latin1; + + + + +create table `heat_template` ( + `artifact_uuid` varchar(200) not null, + `name` varchar(200) not null, + `version` varchar(20) not null, + `description` varchar(1200) default null, + `body` longtext not null, + `timeout_minutes` int(11) default null, + `artifact_checksum` varchar(200) not null default 'manual record', + `creation_timestamp` datetime not null default current_timestamp, + primary key (`artifact_uuid`) +) engine=innodb default charset=latin1; + + + +create table `heat_nested_template` ( + `parent_heat_template_uuid` varchar(200) not null, + `child_heat_template_uuid` varchar(200) not null, + `provider_resource_file` varchar(100) default null, + primary key (`parent_heat_template_uuid`,`child_heat_template_uuid`), + key `fk_heat_nested_template__heat_template2_idx` (`child_heat_template_uuid`), + constraint `fk_heat_nested_template__child_heat_temp_uuid__heat_template1` foreign key (`child_heat_template_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade, + constraint `fk_heat_nested_template__parent_heat_temp_uuid__heat_template1` foreign key (`parent_heat_template_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + + +create table `heat_template_params` ( + `heat_template_artifact_uuid` varchar(200) not null, + `param_name` varchar(100) not null, + `is_required` bit(1) not null, + `param_type` varchar(20) default null, + `param_alias` varchar(45) default null, + primary key (`heat_template_artifact_uuid`,`param_name`), + constraint `fk_heat_template_params__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + +create table `network_recipe` ( + `id` int(11) not null auto_increment, + `model_name` varchar(20) not null, + `action` varchar(50) not null, + `description` varchar(1200) default null, + `orchestration_uri` varchar(256) not null, + `network_param_xsd` varchar(2048) default null, + `recipe_timeout` int(11) default null, + `service_type` varchar(45) default null, + `creation_timestamp` datetime not null default current_timestamp, + `version_str` varchar(20) not null, + primary key (`id`), + unique key `uk_rl4f296i0p8lyokxveaiwkayi` (`model_name`,`action`,`version_str`) +) engine=innodb auto_increment=178 default charset=latin1; + + + + +create table `temp_network_heat_template_lookup` ( + `network_resource_model_name` varchar(200) not null, + `heat_template_artifact_uuid` varchar(200) not null, + `aic_version_min` varchar(20) not null, + `aic_version_max` varchar(20) default null, + primary key (`network_resource_model_name`), + key `fk_temp_network_heat_template_lookup__heat_template1_idx` (`heat_template_artifact_uuid`), + constraint `fk_temp_network_heat_template_lookup__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete no action on update cascade +) engine=innodb default charset=latin1; + + + +create table `network_resource` ( + `model_uuid` varchar(200) not null, + `model_name` varchar(200) not null, + `model_invariant_uuid` varchar(200) default null, + `description` varchar(1200) default null, + `heat_template_artifact_uuid` varchar(200) not null, + `neutron_network_type` varchar(20) default null, + `model_version` varchar(20) default null, + `tosca_node_type` varchar(200) default null, + `aic_version_min` varchar(20) not null, + `aic_version_max` varchar(20) default null, + `orchestration_mode` varchar(20) default 'heat', + `resource_category` varchar(20) default null, + `resource_sub_category` varchar(20) default null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`model_uuid`), + key `fk_network_resource__temp_network_heat_template_lookup1_idx` (`model_name`), + key `fk_network_resource__heat_template1_idx` (`heat_template_artifact_uuid`), + constraint `fk_network_resource__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete no action on update cascade, + constraint `fk_network_resource__temp_network_heat_template_lookup__mod_nm1` foreign key (`model_name`) references `temp_network_heat_template_lookup` (`network_resource_model_name`) on delete no action on update no action +) engine=innodb default charset=latin1; + + + + + +create table `network_resource_customization` ( + `model_customization_uuid` varchar(200) not null, + `model_instance_name` varchar(200) not null, + `network_technology` varchar(45) default null, + `network_type` varchar(45) default null, + `network_role` varchar(200) default null, + `network_scope` varchar(45) default null, + `creation_timestamp` datetime not null default current_timestamp, + `network_resource_model_uuid` varchar(200) not null, + primary key (`model_customization_uuid`), + key `fk_network_resource_customization__network_resource1_idx` (`network_resource_model_uuid`), + constraint `fk_network_resource_customization__network_resource1` foreign key (`network_resource_model_uuid`) references `network_resource` (`model_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + + + +create table `tosca_csar` ( + `artifact_uuid` varchar(200) not null, + `name` varchar(200) not null, + `version` varchar(20) not null, + `description` varchar(1200) default null, + `artifact_checksum` varchar(200) not null, + `url` varchar(200) not null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`artifact_uuid`) +) engine=innodb default charset=latin1; + + + + +create table `service` ( + `model_uuid` varchar(200) not null, + `model_name` varchar(200) not null, + `model_invariant_uuid` varchar(200) not null, + `model_version` varchar(20) not null, + `description` varchar(1200) default null, + `creation_timestamp` datetime not null default current_timestamp, + `tosca_csar_artifact_uuid` varchar(200) default null, + `service_type` varchar(200) default null, + `service_role` varchar(200) default null, + `environment_context` varchar(200) default null, + `workload_context` varchar(200) default null, + `service_category` varchar(200) default null, + primary key (`model_uuid`), + key `fk_service__tosca_csar1_idx` (`tosca_csar_artifact_uuid`), + constraint `fk_service__tosca_csar1` foreign key (`tosca_csar_artifact_uuid`) references `tosca_csar` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + +create table `service_recipe` ( + `id` int(11) not null auto_increment, + `action` varchar(50) not null, + `version_str` varchar(20) default null, + `description` varchar(1200) default null, + `orchestration_uri` varchar(256) not null, + `service_param_xsd` varchar(2048) default null, + `recipe_timeout` int(11) default null, + `service_timeout_interim` int(11) default null, + `creation_timestamp` datetime not null default current_timestamp, + `service_model_uuid` varchar(200) not null, + primary key (`id`), + unique key `uk_7fav5dkux2v8g9d2i5ymudlgc` (`service_model_uuid`,`action`), + key `fk_service_recipe__service1_idx` (`service_model_uuid`), + constraint `fk_service_recipe__service1` foreign key (`service_model_uuid`) references `service` (`model_uuid`) on delete cascade on update cascade +) engine=innodb auto_increment=86 default charset=latin1; + + + +create table `vnf_resource` ( + `orchestration_mode` varchar(20) not null default 'heat', + `description` varchar(1200) default null, + `creation_timestamp` datetime not null default current_timestamp, + `model_uuid` varchar(200) not null, + `aic_version_min` varchar(20) default null, + `aic_version_max` varchar(20) default null, + `model_invariant_uuid` varchar(200) default null, + `model_version` varchar(20) not null, + `model_name` varchar(200) default null, + `tosca_node_type` varchar(200) default null, + `resource_category` varchar(200) default null, + `resource_sub_category` varchar(200) default null, + `heat_template_artifact_uuid` varchar(200) default null, + primary key (`model_uuid`), + key `fk_vnf_resource__heat_template1` (`heat_template_artifact_uuid`), + constraint `fk_vnf_resource__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + + +create table `vf_module` ( + `model_uuid` varchar(200) not null, + `model_invariant_uuid` varchar(200) default null, + `model_version` varchar(20) not null, + `model_name` varchar(200) not null, + `description` varchar(1200) default null, + `is_base` int(11) not null, + `heat_template_artifact_uuid` varchar(200) default null, + `vol_heat_template_artifact_uuid` varchar(200) default null, + `creation_timestamp` datetime not null default current_timestamp, + `vnf_resource_model_uuid` varchar(200) not null, + primary key (`model_uuid`,`vnf_resource_model_uuid`), + key `fk_vf_module__vnf_resource1_idx` (`vnf_resource_model_uuid`), + key `fk_vf_module__heat_template_art_uuid__heat_template1_idx` (`heat_template_artifact_uuid`), + key `fk_vf_module__vol_heat_template_art_uuid__heat_template2_idx` (`vol_heat_template_artifact_uuid`), + constraint `fk_vf_module__heat_template_art_uuid__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade, + constraint `fk_vf_module__vnf_resource1` foreign key (`vnf_resource_model_uuid`) references `vnf_resource` (`model_uuid`) on delete cascade on update cascade, + constraint `fk_vf_module__vol_heat_template_art_uuid__heat_template2` foreign key (`vol_heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + +/*!40101 set @saved_cs_client = @@character_set_client */; +/*!40101 set character_set_client = utf8 */; +create table `vf_module_customization` ( + `model_customization_uuid` varchar(200) not null, + `label` varchar(200) default null, + `initial_count` int(11) default '0', + `min_instances` int(11) default '0', + `max_instances` int(11) default null, + `availability_zone_count` int(11) default null, + `heat_environment_artifact_uuid` varchar(200) default null, + `vol_environment_artifact_uuid` varchar(200) default null, + `creation_timestamp` datetime not null default current_timestamp, + `vf_module_model_uuid` varchar(200) not null, + primary key (`model_customization_uuid`), + key `fk_vf_module_customization__vf_module1_idx` (`vf_module_model_uuid`), + key `fk_vf_module_customization__heat_env__heat_environment1_idx` (`heat_environment_artifact_uuid`), + key `fk_vf_module_customization__vol_env__heat_environment2_idx` (`vol_environment_artifact_uuid`), + constraint `fk_vf_module_customization__heat_env__heat_environment1` foreign key (`heat_environment_artifact_uuid`) references `heat_environment` (`artifact_uuid`) on delete cascade on update cascade, + constraint `fk_vf_module_customization__vf_module1` foreign key (`vf_module_model_uuid`) references `vf_module` (`model_uuid`) on delete cascade on update cascade, + constraint `fk_vf_module_customization__vol_env__heat_environment2` foreign key (`vol_environment_artifact_uuid`) references `heat_environment` (`artifact_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; +/*!40101 set character_set_client = @saved_cs_client */; + +-- +-- table structure for table `vf_module_to_heat_files` +-- + + +/*!40101 set @saved_cs_client = @@character_set_client */; +/*!40101 set character_set_client = utf8 */; +create table `vf_module_to_heat_files` ( + `vf_module_model_uuid` varchar(200) not null, + `heat_files_artifact_uuid` varchar(200) not null, + primary key (`vf_module_model_uuid`,`heat_files_artifact_uuid`), + key `fk_vf_module_to_heat_files__heat_files__artifact_uuid1_idx` (`heat_files_artifact_uuid`), + constraint `fk_vf_module_to_heat_files__heat_files__artifact_uuid1` foreign key (`heat_files_artifact_uuid`) references `heat_files` (`artifact_uuid`) on delete cascade on update cascade, + constraint `fk_vf_module_to_heat_files__vf_module__model_uuid1` foreign key (`vf_module_model_uuid`) references `vf_module` (`model_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1 comment='il fait ce qu''il dit'; +/*!40101 set character_set_client = @saved_cs_client */; + +-- +-- table structure for table `vnf_components` +-- + + +/*!40101 set @saved_cs_client = @@character_set_client */; +/*!40101 set character_set_client = utf8 */; +create table `vnf_components` ( + `vnf_id` int(11) not null, + `component_type` varchar(20) not null, + `heat_template_id` int(11) default null, + `heat_environment_id` int(11) default null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`vnf_id`,`component_type`) +) engine=innodb default charset=latin1; +/*!40101 set character_set_client = @saved_cs_client */; + +-- +-- table structure for table `vnf_components_recipe` +-- + + + +create table `vnf_components_recipe` ( + `id` int(11) not null auto_increment, + `vnf_type` varchar(200) default null, + `vnf_component_type` varchar(45) not null, + `action` varchar(50) not null, + `service_type` varchar(45) default null, + `version` varchar(20) not null, + `description` varchar(1200) default null, + `orchestration_uri` varchar(256) not null, + `vnf_component_param_xsd` varchar(2048) default null, + `recipe_timeout` int(11) default null, + `creation_timestamp` datetime default current_timestamp, + `vf_module_model_uuid` varchar(200) default null, + primary key (`id`), + unique key `uk_4dpdwddaaclhc11wxsb7h59ma` (`vf_module_model_uuid`,`vnf_component_type`,`action`,`version`) +) engine=innodb auto_increment=26 default charset=latin1; + + + + +create table `vnf_recipe` ( + `id` int(11) not null auto_increment, + `nf_role` varchar(200) default null, + `action` varchar(50) not null, + `service_type` varchar(45) default null, + `version_str` varchar(20) not null, + `description` varchar(1200) default null, + `orchestration_uri` varchar(256) not null, + `vnf_param_xsd` varchar(2048) default null, + `recipe_timeout` int(11) default null, + `creation_timestamp` datetime default current_timestamp, + `vf_module_id` varchar(100) default null, + primary key (`id`), + unique key `uk_f3tvqau498vrifq3cr8qnigkr` (`vf_module_id`,`action`,`version_str`) +) engine=innodb auto_increment=10006 default charset=latin1; + + + + + + + + +create table `vnf_resource_customization` ( + `model_customization_uuid` varchar(200) not null, + `model_instance_name` varchar(200) not null, + `min_instances` int(11) default null, + `max_instances` int(11) default null, + `availability_zone_max_count` int(11) default null, + `nf_type` varchar(200) default null, + `nf_role` varchar(200) default null, + `nf_function` varchar(200) default null, + `nf_naming_code` varchar(200) default null, + `creation_timestamp` datetime not null default current_timestamp, + `vnf_resource_model_uuid` varchar(200) not null, + `multi_stage_design` varchar(20) default null, + primary key (`model_customization_uuid`), + key `fk_vnf_resource_customization__vnf_resource1_idx` (`vnf_resource_model_uuid`), + constraint `fk_vnf_resource_customization__vnf_resource1` foreign key (`vnf_resource_model_uuid`) references `vnf_resource` (`model_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + + + +create table `vnf_res_custom_to_vf_module_custom` ( + `vnf_resource_cust_model_customization_uuid` varchar(200) not null, + `vf_module_cust_model_customization_uuid` varchar(200) not null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`vnf_resource_cust_model_customization_uuid`,`vf_module_cust_model_customization_uuid`), + key `fk_vnf_res_custom_to_vf_module_custom__vf_module_customizat_idx` (`vf_module_cust_model_customization_uuid`), + constraint `fk_vnf_res_custom_to_vf_module_custom__vf_module_customization1` foreign key (`vf_module_cust_model_customization_uuid`) references `vf_module_customization` (`model_customization_uuid`) on delete cascade on update cascade, + constraint `fk_vnf_res_custom_to_vf_module_custom__vnf_resource_customiza1` foreign key (`vnf_resource_cust_model_customization_uuid`) references `vnf_resource_customization` (`model_customization_uuid`) on delete cascade on update cascade +) engine=innodb default charset=latin1; + + +create table if not exists `external_service_to_internal_model_mapping` ( +id int(11) not null, +service_name varchar(200) not null, +product_flavor varchar(200) null, +subscription_service_type varchar(200) not null, +service_model_uuid varchar(200) not null, +primary key (id), +unique index uk_external_service_to_internal_model_mapping +(service_name asc, product_flavor asc, service_model_uuid asc)); + +create table if not exists `collection_resource` ( + model_uuid varchar(200) not null, + model_name varchar(200) not null, + model_invariant_uuid varchar(200) not null, + model_version varchar(20) not null, + tosca_node_type varchar(200) not null, + description varchar(200), + creation_timestamp datetime not null default current_timestamp, + primary key (`model_uuid`) +)engine=innodb default charset=latin1; + +create table if not exists `collection_resource_customization` ( + model_customization_uuid varchar(200) not null, + model_instance_name varchar(200) not null, + role varchar(200) NULL, + object_type varchar(200) not null, + function varchar(200) NULL, + collection_resource_type varchar(200) NULL, + creation_timestamp datetime not null default current_timestamp, + cr_model_uuid varchar(200) not null, + primary key (`model_customization_uuid`) +)engine=innodb default charset=latin1; + +create table if not exists `instance_group` ( + model_uuid varchar(200) not null, + model_name varchar(200) not null, + model_invariant_uuid varchar(200) not null, + model_version varchar(20) not null, + tosca_node_type varchar(200) NULL, + role varchar(200) not null, + object_type varchar(200) not null, + creation_timestamp datetime not null default current_timestamp, + cr_model_uuid varchar(200) not null, + instance_group_type varchar(200) not null, + primary key (`model_uuid`) +)engine=innodb default charset=latin1; + + +create table if not exists `collection_resource_instance_group_customization` ( + `collection_resource_customization_model_uuid` varchar(200) not null, + `instance_group_model_uuid` varchar(200) not null, + `function` varchar(200) null, + `description` varchar(1200) null, + `subinterface_network_quantity` int(11) null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`collection_resource_customization_model_uuid`, `instance_group_model_uuid`), + index `fk_collection_resource_instance_group_customization__instan_idx` (`instance_group_model_uuid` asc), + constraint `fk_collection_resource_instance_group_customization__collecti1` + foreign key (`collection_resource_customization_model_uuid`) + references `collection_resource_customization` (`model_customization_uuid`) + on delete cascade + on update cascade, + constraint `fk_collection_resource_instance_group_customization__instance1` + foreign key (`instance_group_model_uuid`) + references `instance_group` (`model_uuid`) + on delete cascade + on update cascade) +engine = innodb +default character set = latin1; + +create table if not exists `vnfc_instance_group_customization` ( + `vnf_resource_customization_model_uuid` varchar(200) not null, + `instance_group_model_uuid` varchar(200) not null, + `function` varchar(200) null, + `description` varchar(1200) null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`vnf_resource_customization_model_uuid`, `instance_group_model_uuid`), + index `fk_vnfc_instance_group_customization__instance_group1_idx` (`instance_group_model_uuid` asc), + constraint `fk_vnfc_instance_group_customization__vnf_resource_customizat1` + foreign key (`vnf_resource_customization_model_uuid`) + references `vnf_resource_customization` (`model_customization_uuid`) + on delete cascade + on update cascade, + constraint `fk_vnfc_instance_group_customization__instance_group1` + foreign key (`instance_group_model_uuid`) + references `instance_group` (`model_uuid`) + on delete cascade + on update cascade) +engine = innodb +default character set = latin1; + + create table if not exists `configuration` + ( `model_uuid` varchar(200) not null, + `model_invariant_uuid` varchar(200) not null, + `model_version` varchar(20) not null, + `model_name` varchar(200) not null, + `tosca_node_type` varchar(200) not null, + `description` varchar(1200) null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`model_uuid`)) + engine = innodb auto_increment = 20654 + default character set = latin1; + + create table if not exists `service_proxy` ( + `model_uuid` varchar(200) not null, + `model_invariant_uuid` varchar(200) not null, + `model_version` varchar(20) not null, + `model_name` varchar(200) not null, + `description` varchar(1200) null, + `creation_timestamp` datetime not null default current_timestamp, + primary key (`model_uuid`)) + engine = innodb auto_increment = 20654 + default character set = latin1; + +create table if not exists `service_proxy_customization` ( +`model_customization_uuid` varchar(200) not null, +`model_instance_name` varchar(200) not null, +`tosca_node_type` varchar(200) not null, +`source_service_model_uuid` varchar(200) not null, +`creation_timestamp` datetime not null default current_timestamp, +`service_proxy_model_uuid` varchar(200) not null, +primary key (`model_customization_uuid`), +index `fk_service_proxy_customization__service_proxy1_idx` (`service_proxy_model_uuid` asc), +index `fk_service_proxy_customization__service1_idx` (`source_service_model_uuid` asc), +constraint`fk_spr_customization__service_proxy_resource1` +foreign key (`service_proxy_model_uuid`) references `service_proxy` (`model_uuid`) +on delete cascade on update cascade, +constraint `fk_service_proxy_resource_customization__service1` +foreign key (`source_service_model_uuid`) references `service` +(`model_uuid`) on delete cascade on update cascade) +engine = innodb +auto_increment = 20654 +default character set = latin1; + +create table if not exists `configuration_customization` ( +`model_customization_uuid` varchar(200) not null, +`model_instance_name` varchar(200) not null, +`configuration_type` varchar(200) null, +`configuration_role` varchar(200) null, +`configuration_function` varchar(200) null, +`creation_timestamp` datetime not null default current_timestamp, +`configuration_model_uuid` varchar(200) not null, +`service_proxy_customization_model_customization_uuid` varchar(200) null, +`configuration_customization_model_customization_uuid` varchar(200) null, +primary key (`model_customization_uuid`), +index `fk_configuration_customization__configuration_idx` (`configuration_model_uuid` asc), +index `fk_configuration_customization__service_proxy_customization_idx` +(`service_proxy_customization_model_customization_uuid` asc), +index `fk_configuration_customization__configuration_customization_idx` +(`configuration_customization_model_customization_uuid` asc), +constraint `fk_configuration_resource_customization__configuration_resour1` +foreign key (`configuration_model_uuid`) references `configuration` (`model_uuid`) +on delete cascade on update cascade, +constraint `fk_configuration_customization__service_proxy_customization1` foreign +key (`service_proxy_customization_model_customization_uuid`) references +`service_proxy_customization` (`model_customization_uuid`) +on delete cascade on update cascade, constraint +`fk_configuration_customization__configuration_customization1` foreign +key (`configuration_customization_model_customization_uuid`) references +`configuration_customization` (`model_customization_uuid`) +on delete cascade on update cascade) +engine = innodb +auto_increment =20654 +default character set = latin1; + + +create table `service_proxy_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + + +create table `configuration_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + + +create table if not exists `collection_resource_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + + +create table `network_resource_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + +create table `vnf_resource_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + +create table `allotted_resource_customization_to_service` ( + `service_model_uuid` varchar(200) not null, + `resource_model_customization_uuid` varchar(200) not null, + primary key (`service_model_uuid`,`resource_model_customization_uuid`) +)engine=innodb default charset=latin1; + + + +create table ar_recipe ( + ID INT(11) not null auto_increment, + MODEL_NAME VARCHAR(200) NOT NULL, + `ACTION` VARCHAR(200) NOT NULL, + VERSION_STR VARCHAR(200) NOT NULL, + SERVICE_TYPE VARCHAR(200), + DESCRIPTION VARCHAR(200), + ORCHESTRATION_URI VARCHAR(200) NOT NULL, + AR_PARAM_XSD VARCHAR(200), + RECIPE_TIMEOUT INT(10), + CREATION_TIMESTAMP DATETIME NOT NULL default current_timestamp, + primary key (ID), + unique key `uk_ar_recipe` (`model_name`,`action`,`version_str`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +alter table collection_resource_customization +add foreign key ( cr_model_uuid) +references collection_resource(model_uuid) +on delete cascade; + +alter table vnf_resource_customization +add column +instance_group_model_uuid varchar(200); + +alter table network_resource_customization +add column +instance_group_model_uuid varchar(200); + + +alter table network_resource_customization +add foreign key ( instance_group_model_uuid) +references instance_group(model_uuid) +on delete cascade; + +alter table collection_resource_customization_to_service +add foreign key (service_model_uuid) +references service(model_uuid) +on delete cascade; + +alter table allotted_resource_customization_to_service +add foreign key (service_model_uuid) +references service(model_uuid) +on delete cascade; + + +alter table vnf_resource_customization_to_service +add foreign key (service_model_uuid) +references service(model_uuid) +on delete cascade; + + +alter table network_resource_customization_to_service +add foreign key (service_model_uuid) +references service(model_uuid) +on delete cascade; + + +alter table network_resource_customization_to_service +add foreign key (resource_model_customization_uuid) +references network_resource_customization(model_customization_uuid) +on delete cascade; + +alter table vnf_resource_customization_to_service +add foreign key (resource_model_customization_uuid) +references vnf_resource_customization(model_customization_uuid) +on delete cascade; + +alter table allotted_resource_customization_to_service +add foreign key (resource_model_customization_uuid) +references allotted_resource_customization(model_customization_uuid) +on delete cascade; + +alter table collection_resource_customization_to_service +add foreign key (resource_model_customization_uuid) +references collection_resource_customization(model_customization_uuid) +on delete cascade; + + +create table if not exists `collection_network_resource_customization` ( +`model_customization_uuid` varchar(200) not null, +`model_instance_name` varchar(200) not null, +`network_technology` varchar(45) null, +`network_type` varchar(45) null, +`network_role` varchar(200) null, +`network_scope` varchar(45) null, +`creation_timestamp` datetime not null default current_timestamp, +`network_resource_model_uuid` varchar(200) not null, `instance_group_model_uuid` varchar(200) null, +`crc_model_customization_uuid` varchar(200) not null, primary key +(`model_customization_uuid`, `crc_model_customization_uuid`), +index `fk_collection_net_resource_customization__network_resource1_idx` +(`network_resource_model_uuid` asc), index +`fk_collection_net_resource_customization__instance_group1_idx` +(`instance_group_model_uuid` asc), index +`fk_col_net_res_customization__collection_res_customization_idx` +(`crc_model_customization_uuid` asc), constraint +`fk_collection_net_resource_customization__network_resource10` foreign +key (`network_resource_model_uuid`) references +`network_resource` (`model_uuid`) on delete cascade on +update cascade, constraint +`fk_collection_net_resource_customization__instance_group10` foreign key +(`instance_group_model_uuid`) references `instance_group` +(`model_uuid`) on delete cascade on update cascade, constraint +`fk_collection_network_resource_customization__collection_reso1` foreign +key (`crc_model_customization_uuid`) references +`collection_resource_customization` +(`model_customization_uuid`) on delete cascade on update cascade) engine += innodb default character set = latin1; + +CREATE TABLE IF NOT EXISTS `rainy_day_handler_macro` ( +`id` INT(11) NOT NULL AUTO_INCREMENT, +`FLOW_NAME` VARCHAR(200) NOT NULL, +`SERVICE_TYPE` VARCHAR(200) NOT NULL, +`VNF_TYPE` VARCHAR(200) NOT NULL, +`ERROR_CODE` VARCHAR(200) NOT NULL, +`WORK_STEP` VARCHAR(200) NOT NULL, +`POLICY` VARCHAR(200) NOT NULL, +PRIMARY KEY (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `northbound_request_ref_lookup` ( +`id` INT(11) NOT NULL AUTO_INCREMENT, +`REQUEST_SCOPE` VARCHAR(200) NOT NULL, +`ACTION` VARCHAR(200) NOT NULL, +`MACRO_ACTION` VARCHAR(200) NOT NULL, +`IS_ALACARTE` TINYINT(1) NOT NULL DEFAULT 0, +`IS_TOPLEVELFLOW` TINYINT(1) NOT NULL DEFAULT 0, +`MIN_API_VERSION` DOUBLE NOT NULL, +`MAX_API_VERSION` DOUBLE NULL, +PRIMARY KEY (`id`), +UNIQUE INDEX `UK_northbound_request_ref_lookup` (`MIN_API_VERSION` ASC, `REQUEST_SCOPE` ASC, `ACTION` ASC, `IS_ALACARTE` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = latin1; + +CREATE TABLE IF NOT EXISTS `orchestration_flow_reference` ( +`id` INT(11) NOT NULL AUTO_INCREMENT, +`COMPOSITE_ACTION` VARCHAR(200) NOT NULL, +`SEQ_NO` INT(11) NOT NULL, +`FLOW_NAME` VARCHAR(200) NOT NULL, +`FLOW_VERSION` DOUBLE NOT NULL, +`NB_REQ_REF_LOOKUP_ID` INT(11) NOT NULL, +PRIMARY KEY (`id`), +INDEX `fk_orchestration_flow_reference__northbound_req_ref_look_idx` (`NB_REQ_REF_LOOKUP_ID` ASC), +UNIQUE INDEX `UK_orchestration_flow_reference` (`COMPOSITE_ACTION` ASC, `FLOW_NAME` ASC, `SEQ_NO` ASC, `NB_REQ_REF_LOOKUP_ID` ASC), +CONSTRAINT `fk_orchestration_flow_reference__northbound_request_ref_look1` +FOREIGN KEY (`NB_REQ_REF_LOOKUP_ID`) REFERENCES `northbound_request_ref_lookup` (`id`) +ON DELETE CASCADE ON UPDATE CASCADE) +ENGINE = InnoDB DEFAULT CHARACTER SET = latin1; + +--------START Request DB SCHEMA -------- +CREATE DATABASE requestdb; +USE requestdb; + + +CREATE TABLE `infra_active_requests` ( + `REQUEST_ID` varchar(45) NOT NULL, + `CLIENT_REQUEST_ID` varchar(45) DEFAULT NULL, + `ACTION` varchar(45) DEFAULT NULL, + `REQUEST_STATUS` varchar(20) DEFAULT NULL, + `STATUS_MESSAGE` longtext DEFAULT NULL, + `PROGRESS` bigint(20) DEFAULT NULL, + `START_TIME` datetime DEFAULT NULL, + `END_TIME` datetime DEFAULT NULL, + `SOURCE` varchar(45) DEFAULT NULL, + `VNF_ID` varchar(45) DEFAULT NULL, + `VNF_NAME` varchar(80) DEFAULT NULL, + `VNF_TYPE` varchar(200) DEFAULT NULL, + `SERVICE_TYPE` varchar(45) DEFAULT NULL, + `AIC_NODE_CLLI` varchar(11) DEFAULT NULL, + `TENANT_ID` varchar(45) DEFAULT NULL, + `PROV_STATUS` varchar(20) DEFAULT NULL, + `VNF_PARAMS` longtext, + `VNF_OUTPUTS` longtext, + `REQUEST_BODY` longtext, + `RESPONSE_BODY` longtext, + `LAST_MODIFIED_BY` varchar(100) DEFAULT NULL, + `MODIFY_TIME` datetime DEFAULT NULL, + `REQUEST_TYPE` varchar(20) DEFAULT NULL, + `VOLUME_GROUP_ID` varchar(45) DEFAULT NULL, + `VOLUME_GROUP_NAME` varchar(45) DEFAULT NULL, + `VF_MODULE_ID` varchar(45) DEFAULT NULL, + `VF_MODULE_NAME` varchar(200) DEFAULT NULL, + `VF_MODULE_MODEL_NAME` varchar(200) DEFAULT NULL, + `AAI_SERVICE_ID` varchar(50) DEFAULT NULL, + `AIC_CLOUD_REGION` varchar(11) DEFAULT NULL, + `CALLBACK_URL` varchar(200) DEFAULT NULL, + `CORRELATOR` varchar(80) DEFAULT NULL, + `NETWORK_ID` varchar(45) DEFAULT NULL, + `NETWORK_NAME` varchar(80) DEFAULT NULL, + `NETWORK_TYPE` varchar(80) DEFAULT NULL, + `REQUEST_SCOPE` varchar(45) NOT NULL DEFAULT 'unknown', + `REQUEST_ACTION` varchar(45) NOT NULL DEFAULT 'unknown', + `SERVICE_INSTANCE_ID` varchar(45) DEFAULT NULL, + `SERVICE_INSTANCE_NAME` varchar(80) DEFAULT NULL, + `REQUESTOR_ID` varchar(50) DEFAULT NULL, + `CONFIGURATION_ID` varchar(45) DEFAULT NULL, + `CONFIGURATION_NAME` varchar(200) DEFAULT NULL, + `OPERATIONAL_ENV_ID` varchar(45) DEFAULT NULL, + `OPERATIONAL_ENV_NAME` varchar(200) DEFAULT NULL, + PRIMARY KEY (`REQUEST_ID`), + UNIQUE KEY `UK_bhu6w8p7wvur4pin0gjw2d5ak` (`CLIENT_REQUEST_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `archived_infra_requests` ( + `REQUEST_ID` varchar(45) NOT NULL, + `CLIENT_REQUEST_ID` varchar(45) DEFAULT NULL, + `ACTION` varchar(45) DEFAULT NULL, + `REQUEST_STATUS` varchar(20) DEFAULT NULL, + `STATUS_MESSAGE` longtext DEFAULT NULL, + `PROGRESS` bigint(20) DEFAULT NULL, + `START_TIME` datetime DEFAULT NULL, + `END_TIME` datetime DEFAULT NULL, + `SOURCE` varchar(45) DEFAULT NULL, + `VNF_ID` varchar(45) DEFAULT NULL, + `VNF_NAME` varchar(80) DEFAULT NULL, + `VNF_TYPE` varchar(200) DEFAULT NULL, + `SERVICE_TYPE` varchar(45) DEFAULT NULL, + `AIC_NODE_CLLI` varchar(11) DEFAULT NULL, + `TENANT_ID` varchar(45) DEFAULT NULL, + `PROV_STATUS` varchar(20) DEFAULT NULL, + `VNF_PARAMS` longtext, + `VNF_OUTPUTS` longtext, + `REQUEST_BODY` longtext, + `RESPONSE_BODY` longtext, + `LAST_MODIFIED_BY` varchar(100) DEFAULT NULL, + `MODIFY_TIME` datetime DEFAULT NULL, + `REQUEST_TYPE` varchar(20) DEFAULT NULL, + `VOLUME_GROUP_ID` varchar(45) DEFAULT NULL, + `VOLUME_GROUP_NAME` varchar(45) DEFAULT NULL, + `VF_MODULE_ID` varchar(45) DEFAULT NULL, + `VF_MODULE_NAME` varchar(200) DEFAULT NULL, + `VF_MODULE_MODEL_NAME` varchar(200) DEFAULT NULL, + `AAI_SERVICE_ID` varchar(50) DEFAULT NULL, + `AIC_CLOUD_REGION` varchar(11) DEFAULT NULL, + `CALLBACK_URL` varchar(200) DEFAULT NULL, + `CORRELATOR` varchar(80) DEFAULT NULL, + `NETWORK_ID` varchar(45) DEFAULT NULL, + `NETWORK_NAME` varchar(80) DEFAULT NULL, + `NETWORK_TYPE` varchar(80) DEFAULT NULL, + `REQUEST_SCOPE` varchar(20) NOT NULL DEFAULT 'unknown', + `REQUEST_ACTION` varchar(45) NOT NULL DEFAULT 'unknown', + `SERVICE_INSTANCE_ID` varchar(45) DEFAULT NULL, + `SERVICE_INSTANCE_NAME` varchar(80) DEFAULT NULL, + `REQUESTOR_ID` varchar(50) DEFAULT NULL, + `CONFIGURATION_ID` varchar(45) DEFAULT NULL, + `CONFIGURATION_NAME` varchar(200) DEFAULT NULL, + `OPERATIONAL_ENV_ID` varchar(45) DEFAULT NULL, + `OPERATIONAL_ENV_NAME` varchar(200) DEFAULT NULL, + PRIMARY KEY (`REQUEST_ID`), + UNIQUE KEY `UK_bhu6w8p7wvur4pin0gjw2d59h` (`CLIENT_REQUEST_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `site_status` ( + `SITE_NAME` varchar(255) NOT NULL, + `STATUS` bit(1) DEFAULT NULL, + `CREATION_TIMESTAMP` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`SITE_NAME`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `watchdog_distributionid_status` ( + `DISTRIBUTION_ID` varchar(45) NOT NULL, + `DISTRIBUTION_ID_STATUS` varchar(45) DEFAULT NULL, + `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `watchdog_per_component_distribution_status` ( + `DISTRIBUTION_ID` varchar(45) NOT NULL, + `COMPONENT_NAME` varchar(45) NOT NULL, + `COMPONENT_DISTRIBUTION_STATUS` varchar(45) DEFAULT NULL, + `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`,`COMPONENT_NAME`), + CONSTRAINT `fk_watchdog_component_distribution_status_watchdog_distributi1` FOREIGN KEY (`DISTRIBUTION_ID`) REFERENCES `watchdog_distributionid_status` (`DISTRIBUTION_ID`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `watchdog_service_mod_ver_id_lookup` ( + `DISTRIBUTION_ID` varchar(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` varchar(45) NOT NULL, + `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`,`SERVICE_MODEL_VERSION_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `activate_operational_env_service_model_distribution_status` ( + `OPERATIONAL_ENV_ID` varchar(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` varchar(45) NOT NULL, + `REQUEST_ID` varchar(45) NOT NULL, + `SERVICE_MOD_VER_FINAL_DISTR_STATUS` varchar(45) DEFAULT NULL, + `RECOVERY_ACTION` varchar(30) DEFAULT NULL, + `RETRY_COUNT_LEFT` int(11) DEFAULT NULL, + `WORKLOAD_CONTEXT` varchar(80) NOT NULL, + `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`OPERATIONAL_ENV_ID`,`SERVICE_MODEL_VERSION_ID`,`REQUEST_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE `activate_operational_env_per_distributionid_status` ( + `DISTRIBUTION_ID` varchar(45) NOT NULL, + `DISTRIBUTION_ID_STATUS` varchar(45) DEFAULT NULL, + `DISTRIBUTION_ID_ERROR_REASON` varchar(250) DEFAULT NULL, + `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `OPERATIONAL_ENV_ID` varchar(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` varchar(45) NOT NULL, + `REQUEST_ID` varchar(45) NOT NULL, + PRIMARY KEY (`DISTRIBUTION_ID`), + KEY `fk_activate_op_env_per_distributionid_status__aoesmds1_idx` (`OPERATIONAL_ENV_ID`,`SERVICE_MODEL_VERSION_ID`,`REQUEST_ID`), + CONSTRAINT `fk_activate_op_env_per_distributionid_status__aoesmds1` FOREIGN KEY (`OPERATIONAL_ENV_ID`, `SERVICE_MODEL_VERSION_ID`, `REQUEST_ID`) REFERENCES `activate_operational_env_service_model_distribution_status` (`OPERATIONAL_ENV_ID`, `SERVICE_MODEL_VERSION_ID`, `REQUEST_ID`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +create table operation_status ( + SERVICE_ID varchar(255) not null, + OPERATION_ID varchar(255) not null, + SERVICE_NAME varchar(255), + OPERATION_TYPE varchar(255), + USER_ID varchar(255), + RESULT varchar(255), + OPERATION_CONTENT varchar(255), + PROGRESS varchar(255), + REASON varchar(255), + OPERATE_AT datetime NOT NULL, + FINISHED_AT datetime NOT NULL, + primary key (SERVICE_ID,OPERATION_ID) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +create table resource_operation_status ( + SERVICE_ID varchar(255) not null, + OPERATION_ID varchar(255) not null, + RESOURCE_TEMPLATE_UUID varchar(255) not null, + OPER_TYPE varchar(255), + RESOURCE_INSTANCE_ID varchar(255), + JOB_ID varchar(255), + STATUS varchar(255), + PROGRESS varchar(255), + ERROR_CODE varchar(255) , + STATUS_DESCRIPOTION varchar(255) , + primary key (SERVICE_ID,OPERATION_ID,RESOURCE_TEMPLATE_UUID) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +create table if not exists model_recipe ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `MODEL_ID` INT(11), + `ACTION` VARCHAR(40), + `SCHEMA_VERSION` VARCHAR(40), + `DESCRIPTION` VARCHAR(40), + `ORCHESTRATION_URI` VARCHAR(20), + `MODEL_PARAM_XSD` VARCHAR(20), + `RECIPE_TIMEOUT` INT(11), + `CREATION_TIMESTAMP` datetime not null default current_timestamp, + PRIMARY KEY (`ID`), + CONSTRAINT uk1_model_recipe UNIQUE (`MODEL_ID`, `ACTION`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +create table if not exists model ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `MODEL_CUSTOMIZATION_ID` VARCHAR(40), + `MODEL_CUSTOMIZATION_NAME` VARCHAR(40), + `MODEL_INVARIANT_ID` VARCHAR(40), + `MODEL_NAME` VARCHAR(40), + `MODEL_TYPE` VARCHAR(20), + `MODEL_VERSION` VARCHAR(20), + `MODEL_VERSION_ID` VARCHAR(40), + `CREATION_TIMESTAMP` datetime not null default current_timestamp, + `RECIPE` INT(11), + PRIMARY KEY (`ID`), + CONSTRAINT uk1_model UNIQUE (`MODEL_TYPE`, `MODEL_VERSION_ID`), + FOREIGN KEY (`RECIPE`) REFERENCES `model_recipe` (`MODEL_ID`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json deleted file mode 100644 index f25a759cd6..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json +++ /dev/null @@ -1,38 +0,0 @@ -{
- "requestDetails": {
- "cloudConfiguration": {
- "lcpCloudRegionId": "mtn6",
- "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
- },
- "modelInfo": {
- "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",
- "modelType": "vfModule",
- "modelVersion": "2.0",
- "modelCustomizationName":"",
- "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",
- "modelCustomizationId": "test",
- "modelNameVersionId": "test"
- },
- "requestInfo": {
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "requestorId": "bp896r",
- "source": "VID",
- "suppressRollback": false
- },
- "requestParameters": {
- "aLaCarte" : true,
- "autoBuildVfModules": false,
- "usePreload": false,
- "userParams": [
- {
- "name": "aic_zone",
- "value": "mtn6"
- }
- ]
- },
- "subscriberInfo": {
- "globalSubscriberId": "MSO_1610_dev",
- "subscriberName": "MSO_1610_dev"
- }
- }
-}
\ No newline at end of file |