Changed files ecomp-model to onap-model

SDNC does not recognize ecomp-model-information
SDNC recognizes onap-model-information
The ecomp-model-information was changed to onap-model-information

Change-Id: I60c02ba6cb272703ad3bca17f71d5407d8a507d2
Issue-Id: SO-289
Signed-off-by: Shailendra Borale <sb8915@att.com>

12 files changed, 32 insertions, 32 deletions

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>