X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml;h=997695b09c8a6cd4c746b2c268f454f92271ddbc;hb=9973bf478f9ffa5a89fc0c8b84e485876324df80;hp=ea56942d150284e965549023bef61c7bc29aaab8;hpb=332639d9d5268e57d81b4282bd72830b4e842681;p=sdnc%2Foam.git

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..997695b0 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>
@@ -169,7 +169,7 @@ value="`$ar-model.version`" />
                                                         </set>
                                                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="tenant" 
-		key="cloud-region.cloud-owner = 'att-aic' AND 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $tmp.ar.cloud-region-id AND
 		     tenant.tenant-id = $tmp.ar.tenant-id"
         pfx='aai.tenant' local-only='false' >