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

1 files changed, 7 insertions, 7 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
+}