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 <sb8915@att.com>

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 b356166..804cc4c 100644 (file)
--- 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 {
                                                   <service-information>\r
                                                      <service-id>${serviceId}</service-id>\r
                                                      <subscription-service-type>${subscriptionServiceType}</subscription-service-type>\r
-                                                         <ecomp-model-information>\r
+                                                         <onap-model-information>\r
                                                                   <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>\r
                                                                   <model-uuid>${serviceModelUuid}</model-uuid>\r
                                                                   <model-version>${serviceModelVersion}</model-version>\r
                                                                   <model-name>${serviceModelName}</model-name>\r
-                              </ecomp-model-information>\r
+                              </onap-model-information>\r
                                                      <service-instance-id>${serviceInstanceId}</service-instance-id>\r
                                                      <global-customer-id>${globalCustomerId}</global-customer-id>\r
                                                      <subscriber-name>${subscriberName}</subscriber-name>\r
@@ -688,13 +688,13 @@ class SDNCAdapterUtils {
                                                   <network-information>\r
                                                      <network-id>${networkId}</network-id>\r
                                                      <network-type>${networkType}</network-type>\r
-                                                         <ecomp-model-information>\r
+                                                         <onap-model-information>\r
                                                                   <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
                                                                   <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>\r
                                                                   <model-uuid>${modelUuid}</model-uuid>\r
                                                                   <model-version>${modelVersion}</model-version>\r
                                                                   <model-name>${modelName}</model-name>\r
-                                                         </ecomp-model-information>\r
+                                                         </onap-model-information>\r
                                                   </network-information>\r
                                                   <network-request-input>\r
                                                     <network-name>${networkName}</network-name>\r
@@ -952,13 +952,13 @@ class SDNCAdapterUtils {
                }               \r
                String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")\r
                String ecompModelInformation =\r
-                               """<ecomp-model-information>\r
+                               """<onap-model-information>\r
                                                <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>\r
                                                <model-uuid>${modelUuid}</model-uuid>\r
                                                ${modelCustomizationString}\r
                                                <model-version>${modelVersion}</model-version>\r
                                                <model-name>${modelName}</model-name>\r
-                               </ecomp-model-information>"""\r
+                               </onap-model-information>"""\r
 \r
                return ecompModelInformation            \r
        } \r
@@ -975,4 +975,4 @@ class SDNCAdapterUtils {
        \r
        \r
 \r
-}
\ 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 18925d3..affb932 100644 (file)
--- 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 {
                                        <service-information>
                                                <service-id>${serviceId}</service-id>
                                                <subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                 <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
                                                 <model-uuid>${modelUuid}</model-uuid>
                                                 <model-version>${modelVersion}</model-version>
                                                 <model-name>${modelName}</model-name>
-                                           </ecomp-model-information>
+                                           </onap-model-information>
                                                <service-instance-id>${serviceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id>${globalSubscriberId}</global-customer-id>

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 85261ee..005edf8 100644 (file)
--- 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
                                        <service-information>
                                                <service-id>${serviceId}</service-id>
                                                <subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                 <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
                                                 <model-uuid>${modelUuid}</model-uuid>
                                                 <model-version>${modelVersion}</model-version>
                                                 <model-name>${modelName}</model-name>
-                                           </ecomp-model-information>
+                                           </onap-model-information>
                                                <service-instance-id>${serviceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id>${globalSubscriberId}</global-customer-id>

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 6dbb4dc..1c9b80a 100644 (file)
--- 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 {
                                        <service-information>
                                                <service-id>${serviceId}</service-id>
                                                <subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                 <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>
                                                 <model-uuid>${modelUuid}</model-uuid>
                                                 <model-version>${modelVersion}</model-version>
                                                 <model-name>${modelName}</model-name>
-                                           </ecomp-model-information>
+                                           </onap-model-information>
                                                <service-instance-id>${serviceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id>${globalSubscriberId}</global-customer-id>

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 9ddfa1e..b46721c 100644 (file)
--- 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{
                                        <service-information>
                                                <service-id></service-id>
                                                <subscription-service-type></subscription-service-type>
-                                               <ecomp-model-information></ecomp-model-information>
+                                               <onap-model-information></onap-model-information>
                                                <service-instance-id>${parentServiceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id></global-customer-id>
@@ -375,13 +375,13 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
                                                <allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
                                                <allotted-resource-type>brg</allotted-resource-type>
                                                <parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                        <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
                                                        <model-uuid>${modelUUId}</model-uuid>
                                                        <model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
                                                        <model-version>${modelVersion}</model-version>
                                                        <model-name>${modelName}</model-name>
-                                               </ecomp-model-information>
+                                               </onap-model-information>
                                        </allotted-resource-information>
                                        <brg-request-input>
                                                        <brg-wan-mac-address>${brgWanMacAddress}</brg-wan-mac-address>

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 8774eff..81e347f 100644 (file)
--- 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{
                                        <service-information>
                                                <service-id></service-id>
                                                <subscription-service-type></subscription-service-type>
-                                               <ecomp-model-information></ecomp-model-information>
+                                               <onap-model-information></onap-model-information>
                                                <service-instance-id>${parentServiceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id></global-customer-id>
@@ -365,13 +365,13 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
                                                <allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
                                                <allotted-resource-type>tunnelxconn</allotted-resource-type>
                                                <parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                        <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
                                                        <model-uuid>${modelUUId}</model-uuid>
                                                        <model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
                                                        <model-version>${modelVersion}</model-version>
                                                        <model-name>${modelName}</model-name>
-                                               </ecomp-model-information>
+                                               </onap-model-information>
                                        </allotted-resource-information>
                                        <tunnelxconn-request-input>
                                                        <brg-wan-mac-address>${brgWanMacAddress}</brg-wan-mac-address>

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 bfdccc8..167c9c8 100644 (file)
--- 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{
                                        <service-information>
                                                <service-id></service-id>
                                                <subscription-service-type></subscription-service-type>
-                                               <ecomp-model-information></ecomp-model-information>
+                                               <onap-model-information></onap-model-information>
                                                <service-instance-id>${parentServiceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id></global-customer-id>
@@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{
                                                <allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
                                                <allotted-resource-type>brg</allotted-resource-type>
                                                <parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                        <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
                                                        <model-uuid>${modelUUId}</model-uuid>
                                                        <model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
                                                        <model-version>${modelVersion}</model-version>
                                                        <model-name>${modelName}</model-name>
-                                               </ecomp-model-information>
+                                               </onap-model-information>
                                        </allotted-resource-information>
                                        <brg-request-input>
                                        </brg-request-input>

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 1f729ac..eb045eb 100644 (file)
--- 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{
                                        <service-information>
                                                <service-id></service-id>
                                                <subscription-service-type></subscription-service-type>
-                                               <ecomp-model-information></ecomp-model-information>
+                                               <onap-model-information></onap-model-information>
                                                <service-instance-id>${parentServiceInstanceId}</service-instance-id>
                                                <subscriber-name/>
                                                <global-customer-id></global-customer-id>
@@ -204,13 +204,13 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{
                                                <allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
                                                <allotted-resource-type>tunnelxconn</allotted-resource-type>
                                                <parent-service-instance-id>${parentServiceInstanceId}</parent-service-instance-id>   
-                                               <ecomp-model-information>
+                                               <onap-model-information>
                                                        <model-invariant-uuid>${modelInvariantId}</model-invariant-uuid>
                                                        <model-uuid>${modelUUId}</model-uuid>
                                                        <model-customization-uuid>${modelCustomizationId}</model-customization-uuid>
                                                        <model-version>${modelVersion}</model-version>
                                                        <model-name>${modelName}</model-name>
-                                               </ecomp-model-information>
+                                               </onap-model-information>
                                        </allotted-resource-information>
                                        <tunnelxconn-request-input>
                                        </tunnelxconn-request-input>

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 2bb8863..b22431a 100644 (file)
--- 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  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -137,13 +137,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r

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 d0b87b3..b45dd0b 100644 (file)
--- 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 =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2098,13 +2098,13 @@ String assignRpcSDNCRequest =
       <network-information>\r
          <network-id>networkId</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2139,12 +2139,12 @@ String activateSDNCRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2152,13 +2152,13 @@ String activateSDNCRequest =
       <network-information>\r
          <network-id>networkId</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2232,12 +2232,12 @@ String sdncRpcRollbackRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2245,13 +2245,13 @@ String sdncRpcRollbackRequest =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2286,12 +2286,12 @@ String sdncActivateRollbackRequest =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name>MSO_1610_dev</subscriber-name>\r
@@ -2299,13 +2299,13 @@ String sdncActivateRollbackRequest =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -2461,13 +2461,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -2508,13 +2508,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -3985,4 +3985,4 @@ String sdncAdapterWorkflowAssignResponse =
 \r
                        return mockExecution\r
                }\r
-}
\ 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 96a84de..bdfd415 100644 (file)
--- 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  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -136,13 +136,13 @@ class DoDeleteNetworkInstanceRollbackTest  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r

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 0f87b64..f1dbb4b 100644 (file)
--- 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 =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name/>\r
@@ -871,13 +871,13 @@ String aaiResponseWithRelationship =
       <network-information>\r
          <network-id>networkId</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -912,12 +912,12 @@ String aaiResponseWithRelationship =
       <service-information>\r
          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>\r
          <subscription-service-type>MSO-dev-service-type</subscription-service-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>\r
             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>\r
             <model-version>1.0</model-version>\r
             <model-name>HNGW Protected OAM</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>\r
          <global-customer-id>globalId_45678905678</global-customer-id>\r
          <subscriber-name/>\r
@@ -925,13 +925,13 @@ String aaiResponseWithRelationship =
       <network-information>\r
          <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>\r
             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>\r
             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>\r
             <model-version>1</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-input>\r
          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>\r
@@ -1926,4 +1926,4 @@ String sdncAdapterWorkflowFormattedResponse_404 =
 \r
                }\r
 \r
-}
\ 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 c97bedb..f4b1a87 100644 (file)
--- 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  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -136,13 +136,13 @@ class DoUpdateNetworkInstanceRollbackTest  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -312,4 +312,4 @@ class DoUpdateNetworkInstanceRollbackTest  {
                        return mockExecution\r
                }\r
 \r
-}
\ 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 fb44067..08088dd 100644 (file)
--- 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 =
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <ecomp-model-information>\r
+         <onap-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </ecomp-model-information>\r
+         </onap-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r

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 50cda81..852c8f9 100644 (file)
--- 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 {
                                        "<service-information>" + EOL + \r
                                        "<service-id/>" + EOL + \r
                                        "<subscription-service-type>123456789</subscription-service-type>" + EOL + \r
-                                       "<ecomp-model-information>" + EOL + \r
+                                       "<onap-model-information>" + EOL + \r
                                        "<model-invariant-uuid/>" + EOL + \r
                                        "<model-uuid/>" + EOL + \r
                                        "<model-version/>" + EOL + \r
                                        "<model-name/>" + EOL + \r
-                                       "</ecomp-model-information>" + EOL + \r
+                                       "</onap-model-information>" + EOL + \r
                                        "<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + \r
                                        "<subscriber-name/>" + EOL + \r
                                        "<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + \r
@@ -174,12 +174,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                                "<service-information>" + EOL + \r
                                "<service-id/>" + EOL + \r
                                "<subscription-service-type>123456789</subscription-service-type>" + EOL + \r
-                               "<ecomp-model-information>" + EOL + \r
+                               "<onap-model-information>" + EOL + \r
                                "<model-invariant-uuid/>" + EOL + \r
                                "<model-uuid/>" + EOL + \r
                                "<model-version/>" + EOL + \r
                                "<model-name/>" + EOL + \r
-                               "</ecomp-model-information>" + EOL + \r
+                               "</onap-model-information>" + EOL + \r
                                "<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + \r
                                "<subscriber-name/>" + EOL + \r
                                "<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + \r
@@ -196,4 +196,4 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
                variables.put("rollbackData",rollbackData);\r
                                \r
        }\r
-}
\ 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 d81b7e8..d47fbda 100644 (file)
--- 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 @@
 <output xmlns="org:onap:sdnctl:vnf">\r
 <brg-topology  xmlns="org:onap:sdnctl:vnf">\r
-    <ecomp-model-information>\r
+    <onap-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r
         <model-version>1.0</model-version>\r
         <model-name>BRGmodelname</model-name>\r
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>\r
-    </ecomp-model-information>\r
+    </onap-model-information>\r
     <allotted-resource-identifiers>\r
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>\r
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>\r

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 f770ec6..9b201d9 100644 (file)
--- 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 @@
 <output xmlns="org:onap:sdnctl:vnf">\r
 <tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">\r
-    <ecomp-model-information>\r
+    <onap-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r
         <model-version>1.0</model-version>\r
         <model-name>TXCmodelname</model-name>\r
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>\r
-    </ecomp-model-information>\r
+    </onap-model-information>\r
     <allotted-resource-identifiers>\r
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>\r
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>\r

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 d81b7e8..d47fbda 100644 (file)
--- 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 @@
 <output xmlns="org:onap:sdnctl:vnf">\r
 <brg-topology  xmlns="org:onap:sdnctl:vnf">\r
-    <ecomp-model-information>\r
+    <onap-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r
         <model-version>1.0</model-version>\r
         <model-name>BRGmodelname</model-name>\r
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>\r
-    </ecomp-model-information>\r
+    </onap-model-information>\r
     <allotted-resource-identifiers>\r
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>\r
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>\r

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 6f86e0f..c86d9cf 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>brg</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <brg-request-input>
        <source-network>

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 30d4c7a..4fe8bbc 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>brg</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <brg-request-input>
        <source-network>

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 e20850a..7320038 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>brg</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <brg-request-input>
        <source-network>

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 f770ec6..9b201d9 100644 (file)
--- 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 @@
 <output xmlns="org:onap:sdnctl:vnf">\r
 <tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">\r
-    <ecomp-model-information>\r
+    <onap-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r
         <model-version>1.0</model-version>\r
         <model-name>TXCmodelname</model-name>\r
         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>\r
-    </ecomp-model-information>\r
+    </onap-model-information>\r
     <allotted-resource-identifiers>\r
         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>\r
         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-id>\r

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 efec7eb..6d2edbe 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>tunnelxconn</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <tunnelxconn-request-input>
        <source-network>

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 9f52758..d33fadb 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>tunnelxconn</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <tunnelxconn-request-input>
        <source-network>

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 025195e..4a90f1a 100644 (file)
--- 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 @@
        <service-information>
        <service-id></service-id>
        <subscription-service-type></subscription-service-type>
-       <ecomp-model-information></ecomp-model-information>
+       <onap-model-information></onap-model-information>
        <service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>
        <subscriber-name/>
        <global-customer-id></global-customer-id>
@@ -29,13 +29,13 @@
        <allotted-resource-id>arId-1</allotted-resource-id>
        <allotted-resource-type>tunnelxconn</allotted-resource-type>
        <parent-service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</parent-service-instance-id>
-       <ecomp-model-information>
+       <onap-model-information>
         <model-invariant-uuid></model-invariant-uuid>
         <model-uuid></model-uuid>
         <model-customization-uuid></model-customization-uuid>
         <model-version></model-version>
         <model-name></model-name>
-       </ecomp-model-information>
+       </onap-model-information>
        </allotted-resource-information>
        <tunnelxconn-request-input>
        <source-network>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
index 50a71c1..13f675c 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVfModuleNoVnf.xml
@@ -5,13 +5,13 @@
                <vf-module-type>vSAMP10aDEV::base::module-0</vf-module-type>\r
                <vf-module-name>zmtn6nf-code-111_base_0</vf-module-name>\r
        </vf-module-topology-identifier>\r
-       <ecomp-model-information>\r
+       <onap-model-information>\r
                <model-name>vSAMP10aDEV::base::module-0</model-name>\r
                <model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>\r
                <model-version>ff2ae348-214a-11e7-93ae-92361f002673</model-version>\r
                <model-invariant-uuid>3a97db99-c4bb-498a-a13a-38f65f1ced3d</model-invariant-uuid>\r
                <model-uuid>ff2ae348-214a-11e7-93ae-92361f002673</model-uuid>\r
-       </ecomp-model-information>\r
+       </onap-model-information>\r
        <tenant>19123c2924c648eb8e42a3c1f14b7682</tenant>\r
        <aic-cloud-region>mtn6</aic-cloud-region>\r
        <aic-clli>AUSTTXGR</aic-clli>           \r
@@ -78,4 +78,4 @@
                                </vms>\r
                        </vf-module-assignments>                                \r
 </vf-module-topology>\r
-</output>
\ No newline at end of file
+</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
index bc2c7b9..dfb1986 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyQueryCallbackVnf.xml
@@ -9,13 +9,13 @@
                <vnf-id>eac30f85-f61f-4c5f-862e-2c62f9e135de</vnf-id>\r
                <vnf-type>null</vnf-type>\r
        </vnf-topology-identifier-structure>\r
-       <ecomp-model-information>\r
+       <onap-model-information>\r
                <model-name>vSAMP10a_macro</model-name>\r
                <model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>\r
                <model-version>1.0</model-version>\r
                <model-invariant-uuid>ef176121-f02c-4dd3-927c-22131d48446b</model-invariant-uuid>\r
                <model-uuid>ff2ae348-214a-11e7-93ae-92361f002672</model-uuid>\r
-       </ecomp-model-information>\r
+       </onap-model-information>\r
        <vnf-resource-assignments>                      \r
                        <vnf-networks>\r
                                        <network-role>mog_exn</network-role>\r
@@ -79,4 +79,4 @@
        <aic-cloud-region>mtn6</aic-cloud-region>\r
        <aic-clli>AUSTTXGR</aic-clli>\r
 </vnf-topology>\r
-</output>
\ No newline at end of file
+</output>