X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_vnf-topology-operation-assign.xml;h=70cce65735fe27353ae4b9086969b8e716de7a81;hb=fac0133e017e76e2d48d86be50b829db45b371f8;hp=828a4bb7559984311b8bfb5f5f7e63f90c05d11b;hpb=894fe3c151228669f466fa334c61b04f7df2251e;p=sdnc%2Foam.git

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 828a4bb7..70cce657 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
@@ -7,7 +7,7 @@
 	<parameter name='ack-final' value='Y'/>
 	<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'
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-model'>
 
@@ -140,7 +140,7 @@
   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 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region AND
 		     depth='0'"
         pfx='aai.cloud-region' local-only='false' >
@@ -167,7 +167,7 @@
   value='`$aai-uid-split[$aai-uid-split_length - 1]`' />
 </set><break/></block></outcome></switch></for><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="availability-zones" 
-		key="cloud-region.cloud-owner = 'att-aic' AND 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region AND
 		     depth='0'"
         pfx='aai.az' local-only='false' >
@@ -182,7 +182,7 @@
 	<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 ' + $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'
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   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[]'>
 
@@ -295,7 +295,7 @@
    force="true" pfx="tmp.AnAI-data">
     <parameter name="relationship-list.relationship[0].related-to" value="availability-zone" />
     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="cloud-region.cloud-owner" />
-    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="att-aic" />
+    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="CloudOwner" />
     <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="cloud-region.cloud-region-id" />
     <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="availability-zone.availability-zone-name" />