Merge "Changed files ecomp-model to onap-model"

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 c43f88434d..437d592bb6 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 {
 						   <service-information>

 						      <service-id>${serviceId}</service-id>

 						      <subscription-service-type>${subscriptionServiceType}</subscription-service-type>

-							  <ecomp-model-information>

+							  <onap-model-information>

 								   <model-invariant-uuid>${serviceModelInvariantUuid}</model-invariant-uuid>

 								   <model-uuid>${serviceModelUuid}</model-uuid>

 								   <model-version>${serviceModelVersion}</model-version>

 								   <model-name>${serviceModelName}</model-name>

-                              </ecomp-model-information>

+                              </onap-model-information>

 						      <service-instance-id>${serviceInstanceId}</service-instance-id>

 						      <global-customer-id>${globalCustomerId}</global-customer-id>

 						      <subscriber-name>${subscriberName}</subscriber-name>

@@ -688,13 +688,13 @@ class SDNCAdapterUtils {
 						   <network-information>

 						      <network-id>${networkId}</network-id>

 						      <network-type>${networkType}</network-type>

-							  <ecomp-model-information>

+							  <onap-model-information>

 								   <model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>

 								   <model-customization-uuid>${modelCustomizationUuid}</model-customization-uuid>

 								   <model-uuid>${modelUuid}</model-uuid>

 								   <model-version>${modelVersion}</model-version>

 								   <model-name>${modelName}</model-name>

-							  </ecomp-model-information>

+							  </onap-model-information>

 						   </network-information>

 						   <network-request-input>

 						     <network-name>${networkName}</network-name>

@@ -951,13 +951,13 @@ class SDNCAdapterUtils {
 		}		

 		String modelName = jsonUtil.getJsonValue(jsonModelInfo, "modelName")

 		String ecompModelInformation =

-				"""<ecomp-model-information>

+				"""<onap-model-information>

 						<model-invariant-uuid>${modelInvariantUuid}</model-invariant-uuid>

 						<model-uuid>${modelUuid}</model-uuid>

 						${modelCustomizationString}

 						<model-version>${modelVersion}</model-version>

 						<model-name>${modelName}</model-name>

-				</ecomp-model-information>"""

+				</onap-model-information>"""

 

 		return ecompModelInformation		

 	} 

@@ -974,4 +974,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 {
 					<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 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
 					<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 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 {
 					<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 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{
 					<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 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{
 					<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 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{
 					<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 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{
 					<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 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  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -137,13 +137,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

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 =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name>MSO_1610_dev</subscriber-name>

@@ -2098,13 +2098,13 @@ String assignRpcSDNCRequest =
       <network-information>

          <network-id>networkId</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -2139,12 +2139,12 @@ String activateSDNCRequest =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name>MSO_1610_dev</subscriber-name>

@@ -2152,13 +2152,13 @@ String activateSDNCRequest =
       <network-information>

          <network-id>networkId</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -2232,12 +2232,12 @@ String sdncRpcRollbackRequest =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name>MSO_1610_dev</subscriber-name>

@@ -2245,13 +2245,13 @@ String sdncRpcRollbackRequest =
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -2286,12 +2286,12 @@ String sdncActivateRollbackRequest =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name>MSO_1610_dev</subscriber-name>

@@ -2299,13 +2299,13 @@ String sdncActivateRollbackRequest =
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -2461,13 +2461,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -2508,13 +2508,13 @@ String sdncAdapterWorkflowAssignResponse =
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -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  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -136,13 +136,13 @@ class DoDeleteNetworkInstanceRollbackTest  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

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 =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name/>

@@ -871,13 +871,13 @@ String aaiResponseWithRelationship =
       <network-information>

          <network-id>networkId</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -912,12 +912,12 @@ String aaiResponseWithRelationship =
       <service-information>

          <service-id>a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb</service-id>

          <subscription-service-type>MSO-dev-service-type</subscription-service-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>fcc85cb0-ad74-45d7-a5a1-17c8744fdb71</model-invariant-uuid>

             <model-uuid>36a3a8ea-49a6-4ac8-b06c-89a54544b9b6</model-uuid>

             <model-version>1.0</model-version>

             <model-name>HNGW Protected OAM</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

          <service-instance-id>f70e927b-6087-4974-9ef8-c5e4d5847ca4</service-instance-id>

          <global-customer-id>globalId_45678905678</global-customer-id>

          <subscriber-name/>

@@ -925,13 +925,13 @@ String aaiResponseWithRelationship =
       <network-information>

          <network-id>bdc5efe8-404a-409b-85f6-0dcc9eebae30</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>sn5256d1-5a33-55df-13ab-12abad84e764</model-invariant-uuid>

             <model-customization-uuid>sn5256d1-5a33-55df-13ab-12abad84e222</model-customization-uuid>

             <model-uuid>sn5256d1-5a33-55df-13ab-12abad84e111</model-uuid>

             <model-version>1</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-input>

          <network-name>MNS-25180-L-01-dmz_direct_net_1</network-name>

@@ -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  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -136,13 +136,13 @@ class DoUpdateNetworkInstanceRollbackTest  {
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

@@ -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 =
       <network-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

          <network-type>CONTRAIL_EXTERNAL</network-type>

-         <ecomp-model-information>

+         <onap-model-information>

             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>

             <model-customization-uuid>customization-uuid</model-customization-uuid>

             <model-uuid>uuid</model-uuid>

             <model-version>version</model-version>

             <model-name>CONTRAIL_EXTERNAL</model-name>

-         </ecomp-model-information>

+         </onap-model-information>

       </network-information>

       <network-request-information>

          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>

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 {
 					"<service-information>" + EOL + 

 					"<service-id/>" + EOL + 

 					"<subscription-service-type>123456789</subscription-service-type>" + EOL + 

-					"<ecomp-model-information>" + EOL + 

+					"<onap-model-information>" + EOL + 

 					"<model-invariant-uuid/>" + EOL + 

 					"<model-uuid/>" + EOL + 

 					"<model-version/>" + EOL + 

 					"<model-name/>" + EOL + 

-					"</ecomp-model-information>" + EOL + 

+					"</onap-model-information>" + EOL + 

 					"<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + 

 					"<subscriber-name/>" + EOL + 

 					"<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + EOL + 

@@ -174,12 +174,12 @@ public class DoCreateSIRollbackTest extends WorkflowTest {
 				"<service-information>" + EOL + 

 				"<service-id/>" + EOL + 

 				"<subscription-service-type>123456789</subscription-service-type>" + EOL + 

-				"<ecomp-model-information>" + EOL + 

+				"<onap-model-information>" + EOL + 

 				"<model-invariant-uuid/>" + EOL + 

 				"<model-uuid/>" + EOL + 

 				"<model-version/>" + EOL + 

 				"<model-name/>" + EOL + 

-				"</ecomp-model-information>" + EOL + 

+				"</onap-model-information>" + EOL + 

 				"<service-instance-id>MIS%252F1604%252F0026%252FSW_INTERNET</service-instance-id>" + EOL + 

 				"<subscriber-name/>" + EOL + 

 				"<global-customer-id>SDN-ETHERNET-INTERNET</global-customer-id>" + 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 @@
 <output xmlns="org:onap:sdnctl:vnf">

 <brg-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

+    <onap-model-information>

         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

         <model-version>1.0</model-version>

         <model-name>BRGmodelname</model-name>

         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

+    </onap-model-information>

     <allotted-resource-identifiers>

         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-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 @@
 <output xmlns="org:onap:sdnctl:vnf">

 <tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

+    <onap-model-information>

         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

         <model-version>1.0</model-version>

         <model-name>TXCmodelname</model-name>

         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

+    </onap-model-information>

     <allotted-resource-identifiers>

         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-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 @@
 <output xmlns="org:onap:sdnctl:vnf">

 <brg-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

+    <onap-model-information>

         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

         <model-version>1.0</model-version>

         <model-name>BRGmodelname</model-name>

         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

+    </onap-model-information>

     <allotted-resource-identifiers>

         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-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 @@
 	<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 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 @@
 	<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 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 @@
 	<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 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 @@
 <output xmlns="org:onap:sdnctl:vnf">

 <tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">

-    <ecomp-model-information>

+    <onap-model-information>

         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>

         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>

         <model-version>1.0</model-version>

         <model-name>TXCmodelname</model-name>

         <model-customization-uuid>013bd784-9bca-4919-ae2f-ae57af27bad9</model-customization-uuid>

-    </ecomp-model-information>

+    </onap-model-information>

     <allotted-resource-identifiers>

         <parent-service-instance-id>parent-service-instance-id</parent-service-instance-id>

         <consuming-service-intance-id>consuming-service-instance-id</consuming-service-intance-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 @@
 	<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 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 @@
 	<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 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 @@
 	<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 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 @@
 		<vf-module-type>vSAMP10aDEV::base::module-0</vf-module-type>

 		<vf-module-name>zmtn6nf-code-111_base_0</vf-module-name>

 	</vf-module-topology-identifier>

-	<ecomp-model-information>

+	<onap-model-information>

 		<model-name>vSAMP10aDEV::base::module-0</model-name>

 		<model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>

 		<model-version>ff2ae348-214a-11e7-93ae-92361f002673</model-version>

 		<model-invariant-uuid>3a97db99-c4bb-498a-a13a-38f65f1ced3d</model-invariant-uuid>

 		<model-uuid>ff2ae348-214a-11e7-93ae-92361f002673</model-uuid>

-	</ecomp-model-information>

+	</onap-model-information>

 	<tenant>19123c2924c648eb8e42a3c1f14b7682</tenant>

 	<aic-cloud-region>mtn6</aic-cloud-region>

 	<aic-clli>AUSTTXGR</aic-clli>		

@@ -78,4 +78,4 @@
 				</vms>

 			</vf-module-assignments>				

 </vf-module-topology>

-</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 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 @@
 		<vnf-id>eac30f85-f61f-4c5f-862e-2c62f9e135de</vnf-id>

 		<vnf-type>null</vnf-type>

 	</vnf-topology-identifier-structure>

-	<ecomp-model-information>

+	<onap-model-information>

 		<model-name>vSAMP10a_macro</model-name>

 		<model-customization-uuid>819ef122-ca19-4141-a61e-62922f8fc279</model-customization-uuid>

 		<model-version>1.0</model-version>

 		<model-invariant-uuid>ef176121-f02c-4dd3-927c-22131d48446b</model-invariant-uuid>

 		<model-uuid>ff2ae348-214a-11e7-93ae-92361f002672</model-uuid>

-	</ecomp-model-information>

+	</onap-model-information>

 	<vnf-resource-assignments>			

 			<vnf-networks>

 					<network-role>mog_exn</network-role>

@@ -79,4 +79,4 @@
 	<aic-cloud-region>mtn6</aic-cloud-region>

 	<aic-clli>AUSTTXGR</aic-clli>

 </vnf-topology>

-</output>
\ No newline at end of file
+</output>