Renamed ecomp-model-information

Updated generic-resource-api DGs to reflect name change of
ecomp-model-information to onap-model-information.  This name change
was missed in initial seed code submission, but is consistent with
API doc published on ONAP wiki.

Change-Id: I5cb95c98ed7c8748fcd2a607bee8b81a6166ae99
Issue-ID: SDNC-98
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 979076e024b63ea7632c3cd57b8d62525482698d

13 files changed, 146 insertions, 146 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
index ea56942d..40309750 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
@@ -96,29 +96,29 @@
                 <parameter name='ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

             </set>

             <set>

-                <parameter name='ar.allotted-resource-data.contrail-route-topology.ecomp-model-information.' 

-value="`$contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.`" />

+                <parameter name='ar.allotted-resource-data.contrail-route-topology.onap-model-information.' 

+value="`$contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.`" />

             </set>

-            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-invariant-uuid'>

+            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>

                 <outcome value=''>

                     <set>

-                        <parameter name='ar.allotted-resource-data.contrail-route-topology.ecomp-model-information.model-invariant-uuid' 

+                        <parameter name='ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-invariant-uuid' 

 value="`$ar-model.invariant-uuid`" />

                     </set>

                 </outcome>

             </switch>

-            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-uuid'>

+            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>

                 <outcome value=''>

                     <set>

-                        <parameter name='sar.allotted-resource-data.contrail-route-topology.ecomp-model-information.model-uuid' 

+                        <parameter name='sar.allotted-resource-data.contrail-route-topology.onap-model-information.model-uuid' 

 value="`$ar-model.uuid`" />

                     </set>

                 </outcome>

             </switch>

-            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-version'>

+            <switch test='$contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>

                 <outcome value=''>

                     <set>

-                        <parameter name='ar.allotted-resource-data.contrail-route-topology.ecomp-model-information.model-version' 

+                        <parameter name='ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-version' 

 value="`$ar-model.version`" />

                     </set>

                 </outcome>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
index 66e402e6..39db7c06 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
@@ -3,7 +3,7 @@
 <outcome value='Y'>
 <block atomic="true">
 <get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from VPN_BINDINGS WHERE network_customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid'
+  key='SELECT * from VPN_BINDINGS WHERE network_customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid'
   pfx='vpn-bindings[]'>
 
 <outcome value='success'>
@@ -349,9 +349,9 @@
 <parameter name='tmp.l3-network.network-technology' value="`$network-model.network-technology`" />
 <parameter name='tmp.l3-network.is-bound-to-vpn' value="`$network-model.is-bound-to-vpn`" />
 <parameter name='tmp.l3-network.orchestration-status' value="PendingCreate" />
-<parameter name='tmp.l3-network.model-invariant-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`" />
-<parameter name='tmp.l3-network.model-version-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-version`" />
-<parameter name='tmp.l3-network.model-customization-id' value="`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`" />
+<parameter name='tmp.l3-network.model-invariant-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`" />
+<parameter name='tmp.l3-network.model-version-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-version`" />
+<parameter name='tmp.l3-network.model-customization-id' value="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`" />
 <parameter name='tmp.l3-network.is-provider-network' value="`$network-model.is-provider-network`" />
 <parameter name='tmp.l3-network.is-shared-network' value="`$network-model.is-shared-network`" />
 <parameter name='tmp.l3-network.is-external-network' value="`$network-model.is-external-network`" />
@@ -542,7 +542,7 @@
 <parameter name='tmp.network-topology.region-identifier.tenant' value="`$network-topology-operation-input.network-request-input.tenant`" />
 <parameter name='tmp.network-topology.region-identifier.aic-cloud-region' value="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 <parameter name='tmp.network-topology.region-identifier.aic-clli' value="`$network-topology-operation-input.network-request-input.aic-clli`" />
-<parameter name='tmp.network-topology.ecomp-model-information.' value="`$network-topology-operation-input.network-information.ecomp-model-information.`" />
+<parameter name='tmp.network-topology.onap-model-information.' value="`$network-topology-operation-input.network-information.onap-model-information.`" />
 <parameter name='tmp.network-topology.network-parameters.' value="`$network-topology-operation-input.network-request-input.network-input-parameters.`" />
 </set><save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="l3-network" 
@@ -742,7 +742,7 @@
 	<parameter name='error-message' value="`'Error writing to l3-network - ' + $tmp.error-message`"/></return></block></block></outcome></save></block></outcome></switch><set>
 <parameter name='network-topology.network-topology-identifier-structure.' value='`$tmp.l3-network.`' />
 <parameter name='network-topology.tenant' value='`$network-topology-operation-input.network-request-input.tenant`' />
-<parameter name='network-topology.ecomp-model-information.' value='`$network-topology-operation-input.network-information.ecomp-model-information.`' />
+<parameter name='network-topology.onap-model-information.' value='`$network-topology-operation-input.network-information.onap-model-information.`' />
 <parameter name='network-topology.network-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />
 <parameter name='network-topology.aic-cloud-region' value='`$network-topology-operation-input.network-request-input.aic-cloud-region`' /></set><switch test='`$service-data.networks.network_length`'>
 <outcome value=''>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
index 25ba878f..79c75355 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
@@ -1,7 +1,7 @@
 <service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='network-topology-operation-unassign' mode='sync'>

 <block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $service-data.networks.network[$nidx].network-data.network-information.ecomp-model-information.model-customization-uuid

-  and service_uuid = $service-data.networks.network[$nidx].network-data.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $service-data.networks.network[$nidx].network-data.network-information.onap-model-information.model-customization-uuid

+  and service_uuid = $service-data.networks.network[$nidx].network-data.service-information.onap-model-information.model-uuid'

   pfx='network-model'>

 

 </get-resource><set>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
index 2ef4a691..b6a2fd56 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
@@ -81,28 +81,28 @@
 <parameter name='sz-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

 

 </set><set>

-<parameter name='sz-ar.allotted-resource-data.security-zone-topology.ecomp-model-information.' 

-value="`$security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.`" />

+<parameter name='sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.' 

+value="`$security-zone-topology-operation-input.allotted-resource-information.onap-model-information.`" />

 

 

-</set><switch test='$security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-invariant-uuid'>

+</set><switch test='$security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.security-zone-topology.ecomp-model-information.model-invariant-uuid' 

+<parameter name='sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-invariant-uuid' 

 value="`$ar-model.invariant-uuid`" />

 

 

-</set></outcome></switch><switch test='$security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-uuid'>

+</set></outcome></switch><switch test='$security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.security-zone-topology.ecomp-model-information.model-uuid' 

+<parameter name='sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-uuid' 

 value="`$ar-model.uuid`" />

 

 

-</set></outcome></switch><switch test='$security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-version'>

+</set></outcome></switch><switch test='$security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.security-zone-topology.ecomp-model-information.model-version' 

+<parameter name='sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-version' 

 value="`$ar-model.version`" />

 

 

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
index bdd730ab..66a710a6 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
@@ -20,7 +20,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="The requested service is pending deletion" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-topology-operation-input.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-topology-operation-input.service-information.onap-model-information.model-uuid'

   pfx='db.service-model'>

 

 <outcome value='failure'>

@@ -32,7 +32,7 @@
 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No model found for service UUID ' + $service-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No model found for service UUID ' + $service-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource><switch test='`$service-topology-operation-input.service-request-input.service-instance-name`'>

 <outcome value=''><block atomic="true"><switch test='`$db.service-model.ecomp-naming`'>

 <outcome value='Y'><block>

@@ -105,8 +105,8 @@
 <parameter name='service-data.service-topology.service-topology-identifier.global-customer-id'

   value='`$service-topology-operation-input.service-information.global-customer-id`' />

 </set><set>

-<parameter name='service-data.service-topology.ecomp-model-information.'

-  value='`$service-topology-operation-input.service-information.ecomp-model-information.`' />

+<parameter name='service-data.service-topology.onap-model-information.'

+  value='`$service-topology-operation-input.service-information.onap-model-information.`' />

 </set><switch test='`$service-topology-operation-input.service-request-input.service-input-parameters.param_length`'>

 <outcome value=''><block>

 </block></outcome><outcome value='Other'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
index 11b6802d..3780fade 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
@@ -42,11 +42,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch><switch test='`$contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`'>

+</return></outcome></switch><switch test='`$contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="contrail-route-information.ecomp-model-information.model-customization-uuid is a required input" />

+    <parameter name="error-message" value="contrail-route-information.onap-model-information.model-customization-uuid is a required input" />

 </return></outcome></switch><switch test='`$contrail-route-topology-operation-input.contrail-route-request-input.source-network.network-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

@@ -68,19 +68,19 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="contrail-route-topology-operation-input.contrail-route-request-input.contrail-applied-service-info.service-instance-id is a required input" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'

   pfx='ar-model'>

 

 <outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $contrail-route-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />

 </return></outcome></get-resource></block></outcome><outcome value='Other'><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
index 49735fdc..b11b8417 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -53,21 +53,21 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />

-</return></outcome></switch></block></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`'>

+</return></outcome></switch></block></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-invariant-uuid is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`'>

+    <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />

+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-customization-uuid is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-uuid`'>

+    <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />

+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-uuid is a required input" />

+    <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />

 </return></outcome></switch><switch test='`$network-topology-operation-input.network-request-input.tenant`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

@@ -78,22 +78,22 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.ecomp-model-information.model-uuid`'>

+</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>

 <outcome value=''><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'

   pfx='service-model'><outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid

-  and service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid

+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'

   pfx='network-model'>

 

 <outcome value='not-found'>

@@ -101,32 +101,32 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource></block></outcome><outcome value='Other'><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'

   pfx='service-model'>

 

 <outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid

-  and service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid

+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'

   pfx='network-model'>

 

 <outcome value='not-found'>

@@ -134,15 +134,15 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource></block></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -153,21 +153,21 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.network-information.network-id is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`'>

+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-invariant-uuid is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`'>

+    <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />

+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-customization-uuid is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-uuid`'>

+    <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />

+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="network-information.ecomp-model-information.model-uuid is a required input" />

+    <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />

 </return></outcome></switch><switch test='`$network-topology-operation-input.network-request-input.tenant`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

@@ -178,22 +178,22 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />

-</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.ecomp-model-information.model-uuid`'>

+</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>

 <outcome value=''><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'

   pfx='service-model'><outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid

-  and service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid

+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'

   pfx='network-model'>

 

 <outcome value='not-found'>

@@ -201,32 +201,32 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource></block></outcome><outcome value='Other'><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'

   pfx='service-model'>

 

 <outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid

-  and service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'

+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid

+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'

   pfx='network-model'>

 

 <outcome value='not-found'>

@@ -234,15 +234,15 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No network model found for customization UUID ' 

-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +

-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />

+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +

+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />

 </return></outcome></get-resource></block></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml
index d7f096da..f0b3a0ef 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml
@@ -42,11 +42,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch><switch test='`$security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`'>

+</return></outcome></switch><switch test='`$security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="security-zone-information.ecomp-model-information.model-customization-uuid is a required input" />

+    <parameter name="error-message" value="security-zone-information.onap-model-information.model-customization-uuid is a required input" />

 </return></outcome></switch><switch test='`$security-zone-topology-operation-input.security-zone-request-input.vlan-tag`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

@@ -63,19 +63,19 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="security-zone-operation-input.security-zone-request-input.untrusted-network-role is a required input" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'

   pfx='ar-model'>

 

 <outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />

 </return></outcome><outcome value='failure'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $security-zone-topology-operation-input.allotted-resource-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />

 </return></outcome></get-resource></block></outcome><outcome value='Other'><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-service-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-service-input.xml
index 36dfdee2..6b94ecba 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-service-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-service-input.xml
@@ -31,19 +31,19 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.global-customer-id is a required input" />

-</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.ecomp-model-information.model-invariant-uuid`'>

+</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="service-information.ecomp-model-information.model-invariant-uuid is a required input" />

-</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.ecomp-model-information.model-uuid`'>

+    <parameter name="error-message" value="service-information.onap-model-information.model-invariant-uuid is a required input" />

+</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.onap-model-information.model-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="service-information.ecomp-model-information.model-uuid is a required input" />

-</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.ecomp-model-information.model-name`'>

+    <parameter name="error-message" value="service-information.onap-model-information.model-uuid is a required input" />

+</return></outcome></switch><switch test='`$service-topology-operation-input.service-information.onap-model-information.model-name`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="service-information.ecomp-model-information.model-name is a required input" />

+    <parameter name="error-message" value="service-information.onap-model-information.model-name is a required input" />

 </return></outcome></switch></block></outcome></switch></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
index 5dda1f97..e28fa147 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
@@ -36,11 +36,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="vf-module-information.vf-module-request-input.vf-module-name is a required input" />

-</return></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-customization-uuid`'>

+</return></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="vf-module-information.ecomp-model-information.model-customization-uuid is a required input" />

+    <parameter name="error-message" value="vf-module-information.onap-model-information.model-customization-uuid is a required input" />

 </return></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-request-input.tenant`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
index ea3caedf..c9515f24 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
@@ -26,11 +26,11 @@
     <parameter name="error-message" value="vnf-information.vnf-id is a required input" />

 </return></outcome></switch><switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>

 <outcome value='assign'>

-<block atomic="true"><switch test='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-customization-uuid`'>

+<block atomic="true"><switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="vnf-information.ecomp-model-information.model-customization-uuid is a required input" />

+    <parameter name="error-message" value="vnf-information.onap-model-information.model-customization-uuid is a required input" />

 </return></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index a17fea69..be6432f0 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -8,7 +8,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'

   pfx='db.vf-module-model'>

 

 <outcome value='failure'>

@@ -20,7 +20,7 @@
 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />

 </return></outcome></get-resource><set>

 <parameter name='vnf-index' value='-1' />

 </set><switch test='`$service-data.vnfs.vnf_length`'>

@@ -108,46 +108,46 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`" />

-</return></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-invariant-uuid`'>

+</return></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>

 <outcome value=''><set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-invariant-uuid'

+<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'

   value='`$db.vf-module-model.invariant-uuid`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-invariant-uuid'

-  value='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-invariant-uuid`' />

-</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-uuid`'>

+<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'

+  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />

+</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>

 <outcome value=''><set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-uuid'

+<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'

   value='`$db.vf-module-model.uuid`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-uuid'

-  value='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-uuid`' />

-</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-version`'>

+<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'

+  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />

+</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>

 <outcome value=''><set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-version'

+<parameter name='tmp.vf-module-topology.onap-model-information.model-version'

   value='`$db.vf-module-model.version`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-version'

-  value='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-version`' />

-</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-name`'>

+<parameter name='tmp.vf-module-topology.onap-model-information.model-version'

+  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />

+</set></outcome></switch><switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>

 <outcome value=''><set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-name'

+<parameter name='tmp.vf-module-topology.onap-model-information.model-name'

   value='`$db.vf-module-model.name`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-name'

-  value='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-name`' />

+<parameter name='tmp.vf-module-topology.onap-model-information.model-name'

+  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />

 </set></outcome></switch><set>

-<parameter name='tmp.vf-module-topology.ecomp-model-information.model-customization-uuid'

-  value='`$vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-customization-uuid`' />

+<parameter name='tmp.vf-module-topology.onap-model-information.model-customization-uuid'

+  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />

 </set><set>

 <parameter name='tmp.vf-module-topology.vf-module-parameters.'

   value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />

 </set><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vf-module-topology-operation-input.vf-module-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'

   pfx='db.vf-module-to-vfc-mapping[]'>

 

 <outcome value='failure'>

@@ -419,9 +419,9 @@
       AND generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"

    force="true" pfx="tmp.AnAI-data">

 <parameter name="vf-module-name" value="`$tmp.vf-module-topology.vf-module-topology-identifier.vf-module-name`" />

-<parameter name="model-invariant-id" value="`$tmp.vf-module-topology.ecomp-model-information.model-invariant-uuid`" />

-<parameter name="model-version-id" value="`$tmp.vf-module-topology.ecomp-model-information.model-uuid`" />

-<parameter name="model-customization-id" value="`$tmp.vf-module-topology.ecomp-model-information.model-customization-uuid`" />

+<parameter name="model-invariant-id" value="`$tmp.vf-module-topology.onap-model-information.model-invariant-uuid`" />

+<parameter name="model-version-id" value="`$tmp.vf-module-topology.onap-model-information.model-uuid`" />

+<parameter name="model-customization-id" value="`$tmp.vf-module-topology.onap-model-information.model-customization-uuid`" />

 <parameter name="selflink" value="`$vf-module-object-path`" />

 <outcome value='failure'>

 <block atomic="true"><switch test='`$plans-index &gt; 0`'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 0b1f2d49..828a4bb7 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -8,7 +8,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'

   pfx='db.vf-model'>

 

 <outcome value='failure'>

@@ -20,7 +20,7 @@
 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.ecomp-model-information.model-customization-uuid`" />

+    <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />

 </return></outcome></get-resource><switch test='`$service-data.vnfs.vnf_length`'>

 <outcome value=''>

 <set>

@@ -103,41 +103,41 @@
 </set><set>

 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name'

    value='`$tmp.vnf-name`' />

-</set><switch test='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-invariant-uuid`'>

+</set><switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>

 <outcome value=''><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-invariant-uuid'

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'

   value='`$db.vf-model.invariant-uuid`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-invariant-uuid'

-  value='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-invariant-uuid`' />

-</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-uuid`'>

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'

+  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />

+</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>

 <outcome value=''><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-uuid'

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'

   value='`$db.vf-model.uuid`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-uuid'

-  value='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-uuid`' />

-</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-version`'>

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'

+  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />

+</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>

 <outcome value=''><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-version'

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'

   value='`$db.vf-model.version`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-version'

-  value='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-version`' />

-</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-name`'>

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'

+  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />

+</set></outcome></switch><switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>

 <outcome value=''><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-name'

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'

   value='`$db.vf-model.name`' />

 </set></outcome><outcome value='Other'>

 <set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-name'

-  value='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-name`' />

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'

+  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />

 </set></outcome></switch><set>

-<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-customization-uuid'

-  value='`$vnf-topology-operation-input.vnf-information.ecomp-model-information.model-customization-uuid`' />

+<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'

+  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />

 </set><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="cloud-region" 

 		key="cloud-region.cloud-owner = 'att-aic' AND 

@@ -183,7 +183,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

-  key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.ecomp-model-information.model-customization-uuid'

+  key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'

   pfx='db.vf-network-role-mapping[]'>

 

 <outcome value='failure'>

@@ -349,9 +349,9 @@
 <parameter name="prov-status" value="PREPROV" />

 <parameter name="operational-status" value="out-of-service-path" />

 <parameter name="equipment-role" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role`" />

-<parameter name="model-invariant-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-invariant-uuid`" />

-<parameter name="model-version-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-uuid`" />

-<parameter name="model-customization-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.ecomp-model-information.model-customization-uuid`" />

+<parameter name="model-invariant-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid`" />

+<parameter name="model-version-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid`" />

+<parameter name="model-customization-id" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid`" />

 <parameter name="selflink" value="`$vnf-object-path`" />

 <outcome value='failure'>

 <return status='failure'>