1 files changed, 24 insertions, 24 deletions
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`'>