From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 30 Jul 2018 15:56:09 -0400 Subject: Containerization feature of SO Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) --- .../SDNCTopologyQueryBRGCallback.xml | 37 ------ .../SDNCTopologyQueryTXCCallback.xml | 24 ---- .../VCPE/CreateVcpeResCustService/arGetById.xml | 31 ----- .../getCatalogServiceResourcesData.json | 127 --------------------- .../getCatalogServiceResourcesNoData.json | 11 -- .../VCPE/CreateVcpeResCustService/getCustomer.xml | 7 -- .../VCPE/CreateVcpeResCustService/request.json | 54 --------- .../CreateVcpeResCustService/requestNoSIName.json | 53 --------- .../requestNoSINameNoRollback.json | 53 --------- 9 files changed, 397 deletions(-) delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json delete mode 100644 bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json (limited to 'bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService') diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml deleted file mode 100644 index d81b7e8f50..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 36e20198-c67a-464b-96d0-aaa99eb2639e - 5b9b15d0-5dd7-47dc-95b9-0440c340a3ba - 1.0 - BRGmodelname - 013bd784-9bca-4919-ae2f-ae57af27bad9 - - - parent-service-instance-id - consuming-service-instance-id - namefromrequest - brg - allottedresourceidfromrequest - - - fq-name - - d1 - drole - - vlan-tag - - s2 - srole - - txc-id - - 1 - 123 - a.b.c.d - - - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml deleted file mode 100644 index f74e51e9d5..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 36e20198-c67a-464b-96d0-aaa99eb2639e - 5b9b15d0-5dd7-47dc-95b9-0440c340a3ba - 1.0 - TXCmodelname - 013bd784-9bca-4919-ae2f-ae57af27bad9 - - - parent-service-instance-id - consuming-service-instance-id - namefromrequest - tunnelxconn - allottedresourceidfromrequest - - - my-vni - my-bearer-ip - my-lan-ip - - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml deleted file mode 100644 index f2063442d6..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml +++ /dev/null @@ -1,31 +0,0 @@ - - ar-1 - Active - Tunnel XConn - Tunnel XConn - Tunnel XConn - - 1490627351232 - - - service-instance - http://localhost:28090/aai/v9/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/123456789/service-instances/service-instance/MIS%252F1604%252F0026%252FSW_INTERNET/allotted-resources/allotted-resource/arId-1 - - customer.global-customer-id - SDN-ETHERNET-INTERNET - - - service-subscription.service-type - 123456789 - - - service-instance.service-instance-id - 88819355-9a71-4ddc-9e22-373f0644b40b - - - service-instance.service-instance-name - vcpe-1702-m010904-name4 - - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json deleted file mode 100644 index e99dd9ccda..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json +++ /dev/null @@ -1,127 +0,0 @@ -{ "serviceResources" : { - "modelInfo" : { - "modelName" : "MSO Test Network", - "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "modelVersion" : null - }, - "serviceVnfs": [ - { "modelInfo" : { - "modelName" : "vHNF for DHV Test", - "modelUuid" : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332", - "modelInvariantUuid" : "6ea0b528-e303-4686-aa77-aa2fcbdccb96", - "modelVersion" : "2.0", - "modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5", - "modelInstanceName" : "vHNF for DHV Test 17" - }, - "toscaNodeType" : null, - "nfFunction" : null, - "nfType" : null, - "nfRole" : null, - "nfNamingCode" : null, - "vfModules": [ - { - "modelInfo" : { - "modelName" : "VhnfForDhvTest..base_TEST..module-0", - "modelUuid" : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a", - "modelInvariantUuid" : "f5696ec0-ec71-4916-bf3b-93a654efcba4", - "modelVersion" : "1", - "modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787" - }, "isBase" : true, - "vfModuleLabel" : "base_TEST", - "initialCount" : 1, - "hasVolumeGroup" : true - } - ] - } - ], - "serviceNetworks": [ - { - "modelInfo" : { - "modelName" : "CONTRAIL_BASIC", - "modelUuid" : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc", - "modelInvariantUuid" : "ab07fbd8-185a-45ac-be45-db3eb02e98d5", - "modelVersion" : null, - "modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9", - "modelInstanceName" : "CONTRAIL_BASIC 5" - }, - "toscaNodeType" : null, - "networkType" : null, - "networkTechnology" : null, - "networkRole" : null, - "networkScope" : null - } - ], - "serviceAllottedResources": [ - { - "modelInfo" : { - "modelName" : "IP_MUX_Demux", - "modelUuid" : "64a1a718-556b-48ce-b3b7-ed3237ccc94f", - "modelInvariantUuid" : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4", - "modelVersion" : "2.0", - "modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93", - "modelInstanceName" : "Pri_IP_MUX_Demux 1" - }, - "toscaNodeType" : null, - "allottedResourceType" : "Tunnel XConn", - "allottedResourceRole" : "Tunnel XConn", - "providingServiceModelInvariantUuid" : null, - "nfFunction" : null, - "nfType" : null, - "nfRole" : null, - "nfNamingCode" : null, - "homingSolution": { - "inventoryType": "service", - "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET", - "vnfHostname": "MDTNJ01", - "cloudOwner": "aic", - "cloudRegionId": "dfwtx", - "aicClli": "KDTNJ01", - "aicVersion": "3.0", - "entitlementPoolList": [ - "f1d563e8-e714-4393-8f99-cc480144a05e", - "j1d563e8-e714-4393-8f99-cc480144a05e" - ], - "licenseKeyGroupList": [ - "s1d563e8-e714-4393-8f99-cc480144a05e", - "b1d563e8-e714-4393-8f99-cc480144a05e" - ] - } - }, - { - "modelInfo" : { - "modelName" : "Service_Admin", - "modelUuid" : "73501e03-ee76-4509-a8ce-96d2a9f33ee9", - "modelInvariantUuid" : "462edf71-1a3c-487b-bf55-497460ab7de3", - "modelVersion" : "2.0", - "modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6", - "modelInstanceName" : "Pri_Service_Admin 5" - }, - "toscaNodeType" : null, - "allottedResourceType" : "BRG", - "allottedResourceRole" : "BRG", - "providingServiceModelInvariantUuid" : null, - "nfFunction" : null, - "nfType" : null, - "nfRole" : null, - "nfNamingCode" : null, - "homingSolution": { - "inventoryType": "service", - "serviceInstanceId": "MIS%252F1604%252F0027%252FSW_INTERNET", - "vnfHostname": "MDTNJ01", - "cloudOwner": "aic", - "cloudRegionId": "dfwtx", - "aicClli": "KDTNJ01", - "aicVersion": "3.0", - "entitlementPoolList": [ - "f1d563e8-e714-4393-8f99-cc480144a05e", - "j1d563e8-e714-4393-8f99-cc480144a05e" - ], - "licenseKeyGroupList": [ - "s1d563e8-e714-4393-8f99-cc480144a05e", - "b1d563e8-e714-4393-8f99-cc480144a05e" - ] - } - } - ] - }} \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json deleted file mode 100644 index 80692b27f5..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesNoData.json +++ /dev/null @@ -1,11 +0,0 @@ -{ "serviceResources" : { - "modelInfo" : { - "modelName" : "MSO Test Network", - "modelUuid" : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "modelVersion" : null - }, - "serviceVnfs": [], - "serviceNetworks": [], - "serviceAllottedResources": [] - }} \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml deleted file mode 100644 index b9d88d15db..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCustomer.xml +++ /dev/null @@ -1,7 +0,0 @@ - - SDN-ETHERNET-INTERNET - SDN-ETHERNET-INTERNET - 1490627351232 - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json deleted file mode 100644 index bc0a1ef491..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "requestDetails": - { - "modelInfo": - { - "modelType":"service", - "modelInvariantUuid":"uuid-miu-svc-011-abcdef", - "modelVersionId":"ASDC_TOSCA_UUID", - "modelName":"SIModelName1", - "modelVersion":"2" - }, - "subscriberInfo": - { - "globalSubscriberId":"SDN-ETHERNET-INTERNET", - "subscriberName":"Kaneohe" - }, - "requestInfo": - { - "instanceName":"VCPE1", - "source":"VID", - "suppressRollback":"false", - "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" - }, - "cloudConfiguration": - { - "lcpCloudRegionId":"cloudowner_mdt1", - "tenantId":"8b1df54faa3b49078e3416e21370a3ba" - }, - "requestParameters": - { - "subscriptionServiceType":"123456789", - "aLaCarte":"false", - "userParams": - [ - { - "name":"BRG_WAN_MAC_Address", - "value":"brgmac" - }, - { - "name": "Customer_Location", - "value": { - "customerLatitude": "32.897480", - "customerLongitude": "-97.040443", - "customerName": "some_company" - } - }, - { - "name":"Homing_Solution", - "value":"sniro" - } - ] - } - } -} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json deleted file mode 100644 index 4100ec76de..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSIName.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "requestDetails": - { - "modelInfo": - { - "modelType":"service", - "modelInvariantUuid":"uuid-miu-svc-011-abcdef", - "modelVersionId":"ASDC_TOSCA_UUID", - "modelName":"SIModelName1", - "modelVersion":"2" - }, - "subscriberInfo": - { - "globalSubscriberId":"SDN-ETHERNET-INTERNET", - "subscriberName":"Kaneohe" - }, - "requestInfo": - { - "source":"VID", - "suppressRollback":"false", - "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" - }, - "cloudConfiguration": - { - "lcpCloudRegionId":"cloudowner_mdt1", - "tenantId":"8b1df54faa3b49078e3416e21370a3ba" - }, - "requestParameters": - { - "subscriptionServiceType":"123456789", - "aLaCarte":"false", - "userParams": - [ - { - "name":"BRG_WAN_MAC_Address", - "value":"brgmac" - }, - { - "name": "Customer_Location", - "value": { - "customerLatitude": "32.897480", - "customerLongitude": "-97.040443", - "customerName": "some_company" - } - }, - { - "name":"Homing_Solution", - "value":"sniro" - } - ] - } - } -} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json deleted file mode 100644 index 5fc0b04180..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/requestNoSINameNoRollback.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "requestDetails": - { - "modelInfo": - { - "modelType":"service", - "modelInvariantUuid":"uuid-miu-svc-011-abcdef", - "modelVersionId":"ASDC_TOSCA_UUID", - "modelName":"SIModelName1", - "modelVersion":"2" - }, - "subscriberInfo": - { - "globalSubscriberId":"SDN-ETHERNET-INTERNET", - "subscriberName":"Kaneohe" - }, - "requestInfo": - { - "source":"VID", - "suppressRollback":"true", - "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" - }, - "cloudConfiguration": - { - "lcpCloudRegionId":"cloudowner_mdt1", - "tenantId":"8b1df54faa3b49078e3416e21370a3ba" - }, - "requestParameters": - { - "subscriptionServiceType":"123456789", - "aLaCarte":"false", - "userParams": - [ - { - "name":"BRG_WAN_MAC_Address", - "value":"brgmac" - }, - { - "name": "Customer_Location", - "value": { - "customerLatitude": "32.897480", - "customerLongitude": "-97.040443", - "customerName": "some_company" - } - }, - { - "name":"Homing_Solution", - "value":"sniro" - } - ] - } - } -} -- cgit 1.2.3-korg