From 23827d0e09514ed102329129dc95fa827927515d Mon Sep 17 00:00:00 2001 From: Shailendra Borale Date: Mon, 30 Oct 2017 17:08:16 -0400 Subject: Changed files ecomp-model to onap-model SDNC does not recognize ecomp-model-information SDNC recognizes onap-model-information The ecomp-model-information was changed to onap-model-information Change-Id: I60c02ba6cb272703ad3bca17f71d5407d8a507d2 Issue-Id: SO-289 Signed-off-by: Shailendra Borale --- .../bpmn/common/scripts/SDNCAdapterUtils.groovy | 14 ++++---- .../scripts/DoCreateServiceInstance.groovy | 4 +-- .../DoCustomDeleteE2EServiceInstance.groovy | 4 +-- .../scripts/DoDeleteServiceInstance.groovy | 4 +-- .../scripts/DoCreateAllottedResourceBRG.groovy | 6 ++-- .../scripts/DoCreateAllottedResourceTXC.groovy | 6 ++-- .../scripts/DoDeleteAllottedResourceBRG.groovy | 6 ++-- .../scripts/DoDeleteAllottedResourceTXC.groovy | 6 ++-- .../DoCreateNetworkInstanceRollbackTest.groovy | 8 ++--- .../scripts/DoCreateNetworkInstanceTest.groovy | 42 +++++++++++----------- .../DoDeleteNetworkInstanceRollbackTest.groovy | 8 ++--- .../scripts/DoDeleteNetworkInstanceTest.groovy | 18 +++++----- .../DoUpdateNetworkInstanceRollbackTest.groovy | 10 +++--- .../scripts/DoUpdateNetworkInstanceTest.groovy | 4 +-- .../infrastructure/DoCreateSIRollbackTest.java | 10 +++--- .../SDNCTopologyQueryBRGCallback.xml | 4 +-- .../SDNCTopologyQueryTXCCallback.xml | 4 +-- .../SDNCTopologyQueryCallback.xml | 4 +-- .../sdncActivateRollbackReq.xml | 6 ++-- .../sdncAssignRollbackReq.xml | 6 ++-- .../sdncCreateRollbackReq.xml | 6 ++-- .../SDNCTopologyQueryCallback.xml | 4 +-- .../sdncActivateRollbackReq.xml | 6 ++-- .../sdncAssignRollbackReq.xml | 6 ++-- .../sdncCreateRollbackReq.xml | 6 ++-- .../SDNCTopologyQueryCallbackVfModuleNoVnf.xml | 6 ++-- .../VfModularity/SDNCTopologyQueryCallbackVnf.xml | 6 ++-- 27 files changed, 107 insertions(+), 107 deletions(-) diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy index b35616680b..804cc4c003 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/SDNCAdapterUtils.groovy @@ -675,12 +675,12 @@ class SDNCAdapterUtils { ${serviceId} ${subscriptionServiceType} - + ${serviceModelInvariantUuid} ${serviceModelUuid} ${serviceModelVersion} ${serviceModelName} - + ${serviceInstanceId} ${globalCustomerId} ${subscriberName} @@ -688,13 +688,13 @@ class SDNCAdapterUtils { ${networkId} ${networkType} - + ${modelInvariantUuid} ${modelCustomizationUuid} ${modelUuid} ${modelVersion} ${modelName} - + ${networkName} @@ -952,13 +952,13 @@ class SDNCAdapterUtils { } String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName") String ecompModelInformation = - """ + """ ${modelInvariantUuid} ${modelUuid} ${modelCustomizationString} ${modelVersion} ${modelName} - """ + """ return ecompModelInformation } @@ -975,4 +975,4 @@ class SDNCAdapterUtils { -} \ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy index 18925d399e..affb932ff4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy @@ -488,12 +488,12 @@ public class DoCreateServiceInstance extends AbstractServiceTaskProcessor { ${serviceId} ${subscriptionServiceType} - + ${modelInvariantUuid} ${modelUuid} ${modelVersion} ${modelName} - + ${serviceInstanceId} ${globalSubscriberId} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy index 85261eec16..005edf8fc4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy @@ -235,12 +235,12 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess ${serviceId} ${subscriptionServiceType} - + ${modelInvariantUuid} ${modelUuid} ${modelVersion} ${modelName} - + ${serviceInstanceId} ${globalSubscriberId} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy index 6dbb4dce7a..1c9b80ac8d 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy @@ -229,12 +229,12 @@ public class DoDeleteServiceInstance extends AbstractServiceTaskProcessor { ${serviceId} ${subscriptionServiceType} - + ${modelInvariantUuid} ${modelUuid} ${modelVersion} ${modelName} - + ${serviceInstanceId} ${globalSubscriberId} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy index 9ddfa1e31c..b46721c88e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy @@ -366,7 +366,7 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{ - + ${parentServiceInstanceId} @@ -375,13 +375,13 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{ ${allottedResourceId} brg ${parentServiceInstanceId} - + ${modelInvariantId} ${modelUUId} ${modelCustomizationId} ${modelVersion} ${modelName} - + ${brgWanMacAddress} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy index 8774effff9..81e347f874 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy @@ -356,7 +356,7 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{ - + ${parentServiceInstanceId} @@ -365,13 +365,13 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{ ${allottedResourceId} tunnelxconn ${parentServiceInstanceId} - + ${modelInvariantId} ${modelUUId} ${modelCustomizationId} ${modelVersion} ${modelName} - + ${brgWanMacAddress} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy index bfdccc80a1..167c9c8b54 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy @@ -195,7 +195,7 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{ - + ${parentServiceInstanceId} @@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{ ${allottedResourceId} brg ${parentServiceInstanceId} - + ${modelInvariantId} ${modelUUId} ${modelCustomizationId} ${modelVersion} ${modelName} - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy index 1f729ac05d..eb045eb54b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy @@ -195,7 +195,7 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{ - + ${parentServiceInstanceId} @@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{ ${allottedResourceId} tunnelxconn ${parentServiceInstanceId} - + ${modelInvariantId} ${modelUUId} ${modelCustomizationId} ${modelVersion} ${modelName} - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy index 2bb88632db..b22431a660 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy @@ -89,13 +89,13 @@ class DoCreateNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -137,13 +137,13 @@ class DoCreateNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy index d0b87b3737..b45dd0bb4e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceTest.groovy @@ -2085,12 +2085,12 @@ String assignRpcSDNCRequest = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 MSO_1610_dev @@ -2098,13 +2098,13 @@ String assignRpcSDNCRequest = networkId CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -2139,12 +2139,12 @@ String activateSDNCRequest = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 MSO_1610_dev @@ -2152,13 +2152,13 @@ String activateSDNCRequest = networkId CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -2232,12 +2232,12 @@ String sdncRpcRollbackRequest = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 MSO_1610_dev @@ -2245,13 +2245,13 @@ String sdncRpcRollbackRequest = 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -2286,12 +2286,12 @@ String sdncActivateRollbackRequest = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 MSO_1610_dev @@ -2299,13 +2299,13 @@ String sdncActivateRollbackRequest = 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -2461,13 +2461,13 @@ String sdncAdapterWorkflowAssignResponse = 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -2508,13 +2508,13 @@ String sdncAdapterWorkflowAssignResponse = 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -3985,4 +3985,4 @@ String sdncAdapterWorkflowAssignResponse = return mockExecution } -} \ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy index 96a84deb26..bdfd415440 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceRollbackTest.groovy @@ -89,13 +89,13 @@ class DoDeleteNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -136,13 +136,13 @@ class DoDeleteNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy index 0f87b6400e..f1dbb4b768 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteNetworkInstanceTest.groovy @@ -858,12 +858,12 @@ String aaiResponseWithRelationship = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 @@ -871,13 +871,13 @@ String aaiResponseWithRelationship = networkId CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -912,12 +912,12 @@ String aaiResponseWithRelationship = a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb MSO-dev-service-type - + fcc85cb0-ad74-45d7-a5a1-17c8744fdb71 36a3a8ea-49a6-4ac8-b06c-89a54544b9b6 1.0 HNGW Protected OAM - + f70e927b-6087-4974-9ef8-c5e4d5847ca4 globalId_45678905678 @@ -925,13 +925,13 @@ String aaiResponseWithRelationship = bdc5efe8-404a-409b-85f6-0dcc9eebae30 CONTRAIL_EXTERNAL - + sn5256d1-5a33-55df-13ab-12abad84e764 sn5256d1-5a33-55df-13ab-12abad84e222 sn5256d1-5a33-55df-13ab-12abad84e111 1 CONTRAIL_EXTERNAL - + MNS-25180-L-01-dmz_direct_net_1 @@ -1926,4 +1926,4 @@ String sdncAdapterWorkflowFormattedResponse_404 = } -} \ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy index c97bedbac1..f4b1a87dd2 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceRollbackTest.groovy @@ -88,13 +88,13 @@ class DoUpdateNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -136,13 +136,13 @@ class DoUpdateNetworkInstanceRollbackTest { 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce @@ -312,4 +312,4 @@ class DoUpdateNetworkInstanceRollbackTest { return mockExecution } -} \ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy index fb44067b68..08088dd544 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateNetworkInstanceTest.groovy @@ -1505,13 +1505,13 @@ String rollbackSDNCRequest = 8abc633a-810b-4ca5-8b3a-09511d13a2ce CONTRAIL_EXTERNAL - + invariant-uuid customization-uuid uuid version CONTRAIL_EXTERNAL - + 8abc633a-810b-4ca5-8b3a-09511d13a2ce diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java index 50cda81a58..852c8f922f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java +++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateSIRollbackTest.java @@ -136,12 +136,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest { "" + EOL + "" + EOL + "123456789" + EOL + - "" + EOL + + "" + EOL + "" + EOL + "" + EOL + "" + EOL + "" + EOL + - "" + EOL + + "" + EOL + "MIS%252F1604%252F0026%252FSW_INTERNET" + EOL + "" + EOL + "SDN-ETHERNET-INTERNET" + EOL + @@ -174,12 +174,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest { "" + EOL + "" + EOL + "123456789" + EOL + - "" + EOL + + "" + EOL + "" + EOL + "" + EOL + "" + EOL + "" + EOL + - "" + EOL + + "" + EOL + "MIS%252F1604%252F0026%252FSW_INTERNET" + EOL + "" + EOL + "SDN-ETHERNET-INTERNET" + EOL + @@ -196,4 +196,4 @@ public class DoCreateSIRollbackTest extends WorkflowTest { variables.put("rollbackData",rollbackData); } -} \ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml index d81b7e8f50..d47fbda01c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml @@ -1,12 +1,12 @@ - + 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 diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml index f770ec6aff..9b201d9808 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml @@ -1,12 +1,12 @@ - + 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 diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml index d81b7e8f50..d47fbda01c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml @@ -1,12 +1,12 @@ - + 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 diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml index 6f86e0fb86..c86d9cf77f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncActivateRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 brg MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml index 30d4c7ae49..4fe8bbcbde 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncAssignRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 brg MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml index e20850a7b9..7320038de4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRGRollback/sdncCreateRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 brg MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml index f770ec6aff..9b201d9808 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml @@ -1,12 +1,12 @@ - + 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 diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml index efec7eb001..6d2edbe9d6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncActivateRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 tunnelxconn MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml index 9f52758750..d33fadb427 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncAssignRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 tunnelxconn MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml index 025195e326..4a90f1a573 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/sdncCreateRollbackReq.xml @@ -20,7 +20,7 @@ - + MIS%252F1604%252F0026%252FSW_INTERNET @@ -29,13 +29,13 @@ arId-1 tunnelxconn MIS%252F1604%252F0026%252FSW_INTERNET - + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml index 50a71c110e..13f675cd43 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml @@ -5,13 +5,13 @@ vSAMP10aDEV::base::module-0 zmtn6nf-code-111_base_0 - + vSAMP10aDEV::base::module-0 819ef122-ca19-4141-a61e-62922f8fc279 ff2ae348-214a-11e7-93ae-92361f002673 3a97db99-c4bb-498a-a13a-38f65f1ced3d ff2ae348-214a-11e7-93ae-92361f002673 - + 19123c2924c648eb8e42a3c1f14b7682 mtn6 AUSTTXGR @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml index bc2c7b9e63..dfb1986057 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml +++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml @@ -9,13 +9,13 @@ eac30f85-f61f-4c5f-862e-2c62f9e135de null - + vSAMP10a_macro 819ef122-ca19-4141-a61e-62922f8fc279 1.0 ef176121-f02c-4dd3-927c-22131d48446b ff2ae348-214a-11e7-93ae-92361f002672 - + mog_exn @@ -79,4 +79,4 @@ mtn6 AUSTTXGR - \ No newline at end of file + -- cgit 1.2.3-korg