From 9d8d8d99489dc92951d9e587e8fdc8f048d53e26 Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Wed, 29 Jul 2020 18:39:01 +0100 Subject: Refactor PNF names in BPMN workflows Issue-ID: SO-3105 Signed-off-by: zrrmmua Change-Id: I8cab1afa54ea8a1981fcddcf0c25f6f86bb14421 --- .../request/GenericPnfSoftwareUpgradeTest.json | 54 ++++++++++++++++++++++ .../resources/request/PNFSoftwareUpgradeTest.json | 54 ---------------------- .../response/GenericPnfSoftwareUpgradeTest.json | 26 +++++++++++ .../GenericPnfSoftwareUpgradeTest_catalogdb.json | 39 ++++++++++++++++ .../resources/response/PNFSoftwareUpgradeTest.json | 26 ----------- .../response/PNFSoftwareUpgradeTest_catalogdb.json | 39 ---------------- 6 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/GenericPnfSoftwareUpgradeTest.json delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/PNFSoftwareUpgradeTest.json create mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest.json create mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest_catalogdb.json delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest.json delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest_catalogdb.json (limited to 'bpmn/so-bpmn-infrastructure-flows/src/test/resources') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/GenericPnfSoftwareUpgradeTest.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/GenericPnfSoftwareUpgradeTest.json new file mode 100644 index 0000000000..a101118623 --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/GenericPnfSoftwareUpgradeTest.json @@ -0,0 +1,54 @@ +{ + "requestDetails":{ + "requestInfo":{ + "source":"VID", + "suppressRollback":false, + "requestorId":"demo", + "productFamilyId":"SWUPid" + }, + "modelInfo":{ + "modelType":"service", + "modelInvariantUuid":"339b7a2f-9524-4dbf-9eee-f2e05521df3f", + "modelInvariantId":"339b7a2f-9524-4dbf-9eee-f2e05521df3f", + "modelUuid":"32daaac6-5017-4e1e-96c8-6a27dfbe1421", + "modelName":"PNF_int_service_2", + "modelVersion":"1.0" + }, + "requestParameters":{ + "userParams":[ + { + "name":"aic_zone", + "value":"nova" + }, + { + "name":"pnfId", + "value":"PNFDemo" + }, + { + "name":"targetSoftwareVersion", + "value":"demo-sw-ver2.0.0" + }, + { + "name":"pnfName", + "value":"PNFDemo" + } + ], + "subscriptionServiceType":"SWUP", + "aLaCarte":false + }, + "cloudConfiguration":{ + "lcpCloudRegionId":"regionOne", + "tenantId":"09a63533072f4a579d5c99c3b8fe94c6" + }, + "subscriberInfo":{ + "globalSubscriberId":"ADemoCustomerInEric" + }, + "project":{ + "projectName":"Project-Demonstration" + }, + "owningEntity":{ + "owningEntityId":"5eae949c-1c50-4780-b8b5-7cbeb08856b4", + "owningEntityName":"OE-Demonstration" + } + } +} \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/PNFSoftwareUpgradeTest.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/PNFSoftwareUpgradeTest.json deleted file mode 100644 index a101118623..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/request/PNFSoftwareUpgradeTest.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "requestDetails":{ - "requestInfo":{ - "source":"VID", - "suppressRollback":false, - "requestorId":"demo", - "productFamilyId":"SWUPid" - }, - "modelInfo":{ - "modelType":"service", - "modelInvariantUuid":"339b7a2f-9524-4dbf-9eee-f2e05521df3f", - "modelInvariantId":"339b7a2f-9524-4dbf-9eee-f2e05521df3f", - "modelUuid":"32daaac6-5017-4e1e-96c8-6a27dfbe1421", - "modelName":"PNF_int_service_2", - "modelVersion":"1.0" - }, - "requestParameters":{ - "userParams":[ - { - "name":"aic_zone", - "value":"nova" - }, - { - "name":"pnfId", - "value":"PNFDemo" - }, - { - "name":"targetSoftwareVersion", - "value":"demo-sw-ver2.0.0" - }, - { - "name":"pnfName", - "value":"PNFDemo" - } - ], - "subscriptionServiceType":"SWUP", - "aLaCarte":false - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"regionOne", - "tenantId":"09a63533072f4a579d5c99c3b8fe94c6" - }, - "subscriberInfo":{ - "globalSubscriberId":"ADemoCustomerInEric" - }, - "project":{ - "projectName":"Project-Demonstration" - }, - "owningEntity":{ - "owningEntityId":"5eae949c-1c50-4780-b8b5-7cbeb08856b4", - "owningEntityName":"OE-Demonstration" - } - } -} \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest.json new file mode 100644 index 0000000000..32539844ba --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest.json @@ -0,0 +1,26 @@ +{ + "serviceResources":{ + "modelInfo":{ + "modelInvariantId":"439b7a2f-9524-4dbf-9eee-f2e05521df3f", + "modelUuid":"42daaac6-5017-4e1e-96c8-6a27dfbe1421", + "modelName":"PNF_int_service_2", + "modelVersion":"1.0" + }, + "serviceType":"NA", + "environmentContext":"Luna", + "serviceRole":"NA", + "workloadContext":"Oxygen", + "serviceVnfs":[ + + ], + "serviceNetworks":[ + + ], + "serviceAllottedResources":[ + + ], + "configResource":[ + + ] + } +} \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest_catalogdb.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest_catalogdb.json new file mode 100644 index 0000000000..faec947fec --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/GenericPnfSoftwareUpgradeTest_catalogdb.json @@ -0,0 +1,39 @@ +{ + "_embedded": { + "pnfResourceCustomization": [ + { + "modelCustomizationUUID": "38dc9a92-214c-11e7-93ae-92361f002680", + "modelInstanceName": "PNF routing", + "created": "2019-03-08 12:00:29.000", + "nfFunction": "routing", + "nfType": "routing", + "nfRole": "routing", + "nfNamingCode": "routing", + "multiStageDesign": null, + "resourceInput": null, + "blueprintName": "test_pnf_software_upgrade_restconf", + "blueprintVersion": "1.0.0", + "skipPostInstConf": false, + "softwareVersion": "1.0.0", + "creationTimestamp": "2019-03-08T12:00:29.000+0000", + "controllerActor": "cds", + "_links": { + "self": { + "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680" + }, + "pnfResourceCustomization": { + "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680" + }, + "pnfResources": { + "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680/pnfResources" + } + } + } + ] + }, + "_links": { + "self": { + "href": "http://localhost:41023/pnfResourceCustomization/search/findPnfResourceCustomizationByModelUuid?SERVICE_MODEL_UUID=4df8b6de-2083-11e7-93ae-92361f002676" + } + } +} \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest.json deleted file mode 100644 index 32539844ba..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "serviceResources":{ - "modelInfo":{ - "modelInvariantId":"439b7a2f-9524-4dbf-9eee-f2e05521df3f", - "modelUuid":"42daaac6-5017-4e1e-96c8-6a27dfbe1421", - "modelName":"PNF_int_service_2", - "modelVersion":"1.0" - }, - "serviceType":"NA", - "environmentContext":"Luna", - "serviceRole":"NA", - "workloadContext":"Oxygen", - "serviceVnfs":[ - - ], - "serviceNetworks":[ - - ], - "serviceAllottedResources":[ - - ], - "configResource":[ - - ] - } -} \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest_catalogdb.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest_catalogdb.json deleted file mode 100644 index faec947fec..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/response/PNFSoftwareUpgradeTest_catalogdb.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "_embedded": { - "pnfResourceCustomization": [ - { - "modelCustomizationUUID": "38dc9a92-214c-11e7-93ae-92361f002680", - "modelInstanceName": "PNF routing", - "created": "2019-03-08 12:00:29.000", - "nfFunction": "routing", - "nfType": "routing", - "nfRole": "routing", - "nfNamingCode": "routing", - "multiStageDesign": null, - "resourceInput": null, - "blueprintName": "test_pnf_software_upgrade_restconf", - "blueprintVersion": "1.0.0", - "skipPostInstConf": false, - "softwareVersion": "1.0.0", - "creationTimestamp": "2019-03-08T12:00:29.000+0000", - "controllerActor": "cds", - "_links": { - "self": { - "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680" - }, - "pnfResourceCustomization": { - "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680" - }, - "pnfResources": { - "href": "http://localhost:41023/pnfResourceCustomization/38dc9a92-214c-11e7-93ae-92361f002680/pnfResources" - } - } - } - ] - }, - "_links": { - "self": { - "href": "http://localhost:41023/pnfResourceCustomization/search/findPnfResourceCustomizationByModelUuid?SERVICE_MODEL_UUID=4df8b6de-2083-11e7-93ae-92361f002676" - } - } -} \ No newline at end of file -- cgit 1.2.3-korg