ecomp-model-information to onap-model-information

Change-Id: I05f4648ff898a54e7a00d899d97129746172cdb4
Issue-ID: SO-603
Signed-off-by: Arthur Martella <am153x@att.com>

13 files changed, 86 insertions, 75 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 20a8210c50..7aa7b200f3 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
@@ -22,7 +22,8 @@ package org.openecomp.mso.bpmn.common.scripts;
 

 import org.apache.commons.lang3.*

 import org.camunda.bpm.engine.delegate.BpmnError

-import org.camunda.bpm.engine.delegate.DelegateExecution


+import org.camunda.bpm.engine.delegate.DelegateExecution

+

 import org.openecomp.mso.bpmn.core.WorkflowException

 import org.openecomp.mso.bpmn.core.json.JsonUtils;

 import org.springframework.web.util.UriUtils

@@ -43,7 +44,8 @@ class SDNCAdapterUtils {
 		this.taskProcessor = taskProcessor

 	}

 

-	String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {


+	String SDNCAdapterFeatureRequest(DelegateExecution execution, String requestName, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {

+

 		def utils=new MsoUtils()

 

 		def prefix = execution.getVariable('prefix')

@@ -88,7 +90,8 @@ class SDNCAdapterUtils {
 		return sdncAdapterFeatureRequest

 	}

 

-	String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {


+	String SDNCAdapterActivateVnfRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String msoAction, String timeoutValueInMinutes) {

+

 		def utils=new MsoUtils()

 

 		def prefix = execution.getVariable('prefix')

@@ -131,7 +134,8 @@ class SDNCAdapterUtils {
 		return sdncAdapterActivateVnfRequest

 	}

 

-	String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {


+	String SDNCAdapterL3ToHigherLayerRequest(DelegateExecution execution, String action, String callbackURL, String serviceOperation, String timeoutValueInMinutes) {

+

 		def utils=new MsoUtils()

 

 		def prefix = execution.getVariable('prefix')

@@ -230,7 +234,8 @@ class SDNCAdapterUtils {
 

 

 

-	private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,


+	private void SDNCAdapterActivateRequest(DelegateExecution execution, String resultVar, String svcAction,

+

 			String svcOperation, String additionalData) {

 			def utils=new MsoUtils()

 

@@ -329,7 +334,8 @@ class SDNCAdapterUtils {
 	 * @param resultVar the execution variable in which the result will be stored

 	 * @param isAic3 boolean to indicate whether request is for AIC3.0

 	 */

-	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {


+	public void sdncReservePrep(DelegateExecution execution, String action, String resultVar, boolean isAic3) {

+

 		sdncPrep(execution, resultVar, action , 'service-configuration-operation', null, isAic3, this.taskProcessor)

 	}

 

@@ -356,7 +362,8 @@ class SDNCAdapterUtils {
 	 * @param additionalData additional XML content to be inserted into the RequestData element (may be null)

 	 * @param isAic3 boolean to indicate whether request is for AIC3.0

 	 */

-	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,


+	public void sdncPrep(DelegateExecution execution, String resultVar, String svcAction,

+

 			String svcOperation, String additionalData, boolean isAic3, AbstractServiceTaskProcessor taskProcessor) {

 		def method = getClass().getSimpleName() + '.sdncPrep(' +

 			'execution=' + execution.getId() +

@@ -489,7 +496,8 @@ class SDNCAdapterUtils {
 	 * @param additionalData additional XML content to be inserted into the

 	 *   RequestData element (may be null)

 	 */

-	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {


+	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {

+

 		 def utils=new MsoUtils()

 

 		 // SNDC is expecting request Id for header as unique each call.

@@ -607,7 +615,8 @@ class SDNCAdapterUtils {
 	  * @param additionalData additional XML content to be inserted into the

 	  *   RequestData element (may be null)

 	  */

-	  public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {


+	  public String sdncTopologyRequestRsrc (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String additionalData) {

+

 		  def utils=new MsoUtils()

 

 		  // SNDC is expecting request Id for header as unique each call.

@@ -729,12 +738,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>

@@ -742,13 +751,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>

@@ -769,7 +778,8 @@ class SDNCAdapterUtils {
 			 * @param responseVar the execution variable in which the response is stored

 			 * @param workflowException the WorkflowException Object returned from sdnc call

 			 */

-	public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){


+	public void validateSDNCResponse(DelegateExecution execution, String response, WorkflowException workflowException, boolean successIndicator){

+

 		def isDebugLogEnabled = execution.getVariable('isDebugLogEnabled')

 		taskProcessor.utils.log("DEBUG", "SDNC Response is: " + response, isDebugLogEnabled)

 		taskProcessor.utils.log("DEBUG", "SuccessIndicator is: " + successIndicator, isDebugLogEnabled)

@@ -883,7 +893,8 @@ class SDNCAdapterUtils {
 			 * @param responseCodeVar the execution variable in which the response code is stored

 			 * @param errorResponseVar the execution variable in which the error response is stored

 			 */

-			public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {


+			public void validateL3BondingSDNCResp(DelegateExecution execution, String response, WorkflowException workflowException, boolean success) {

+

 				def method = getClass().getSimpleName() + '.validateL3BondingSDNCResp(' +

 					'execution=' + execution.getId() +

 					', response=' + response +

@@ -1006,13 +1017,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		

 	} 

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 5789e710e7..c142532794 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
@@ -544,12 +544,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/DoDeleteServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteServiceInstance.groovy
index 8fc1f41569..802090b02a 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
@@ -212,12 +212,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 7d7c862a0b..f04b7384a1 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
@@ -379,7 +379,7 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalCustomerId}</global-customer-id>
@@ -388,13 +388,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 2240c605af..dc248845b9 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
@@ -373,7 +373,7 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalCustomerId}</global-customer-id>
@@ -382,13 +382,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 839766eabc..83ef53d5dd 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
@@ -200,7 +200,7 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalCustomerId}</global-customer-id>
@@ -209,13 +209,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 c1b0eb5fff..2c531b4224 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
@@ -200,7 +200,7 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{
 					<service-information>
 						<service-id></service-id>
 						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
-						<ecomp-model-information></ecomp-model-information>
+						<onap-model-information></onap-model-information>
 						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
 						<global-customer-id>${globalCustomerId}</global-customer-id>
@@ -209,13 +209,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 8c7afc9fbf..157e7db234 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 552a560d10..dafbe3c8ac 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
@@ -2369,12 +2369,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>

@@ -2382,13 +2382,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>

@@ -2423,12 +2423,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>

@@ -2436,13 +2436,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>

@@ -2516,12 +2516,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>

@@ -2529,13 +2529,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>

@@ -2570,12 +2570,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>

@@ -2583,13 +2583,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>

@@ -2745,13 +2745,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>

@@ -2792,13 +2792,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>

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 1dcd733c8a..345ca1bc2c 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 bc00123121..d357444cfc 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>

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 09f1cfb982..a4d57d265d 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>
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 e84d031275..8390ac3f6b 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
@@ -1588,13 +1588,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>