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

1 files changed, 24 insertions, 24 deletions

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'>