Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / vcpe / scripts / DoCreateAllottedResourceTXC.groovy

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 2240c60..dc24884 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
@@ -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>