Merge "Replace att-aic with Rackspace"

Former-commit-id: 412e0e8b705ebb762cee8225c676b2d2f987d393

8 files changed, 14 insertions, 14 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
index 0d099265..54bd6953 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
@@ -103,7 +103,7 @@
 

 </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 = 'Rackspace' 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' >

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 40309750..ce866701 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
@@ -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 = 'Rackspace' 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' >

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
index 1eb00a55..401fb1d1 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
@@ -89,7 +89,7 @@
 

 </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 = 'Rackspace' 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' >

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
index 01c01749..52d4a302 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
@@ -94,7 +94,7 @@
 

 </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 = 'Rackspace' 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' >

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
index 147aa608..7ee7deee 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
@@ -103,7 +103,7 @@
 

 </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 = 'Rackspace' 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' >

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 39db7c06..6f03a145 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
@@ -45,7 +45,7 @@
 
 </return></outcome></get-resource></block></outcome></switch><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 = 'Rackspace' AND 
 		     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND
 		     tenant.tenant-id = $network-topology-operation-input.network-request-input.tenant"
         pfx='aai.tenant' local-only='false' >
@@ -385,7 +385,7 @@
 
 </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 = 'Rackspace' AND 
 		     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND 
 		     depth = '0'"
         pfx='aai.cloud-region' local-only='false' >
@@ -690,14 +690,14 @@
 	<!-- create relationship-list -->
 	<parameter name="relationship-list.relationship[0].related-to" value="tenant" />
 	<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="Rackspace" />
 	<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="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 	<parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="tenant.tenant-id" />
 	<parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$network-topology-operation-input.network-request-input.tenant`" />
 	<parameter name="relationship-list.relationship[1].related-to" value="cloud-region" />
 	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="cloud-region.cloud-owner" />
-	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="att-aic" />
+	<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="Rackspace" />
 	<parameter name="relationship-list.relationship[1].relationship-data[1].relationship-key" value="cloud-region.cloud-region-id" />
 	<parameter name="relationship-list.relationship[1].relationship-data[1].relationship-value" value="`$network-topology-operation-input.network-request-input.aic-cloud-region`" />
 	
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 be6432f0..a2c19632 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
@@ -79,7 +79,7 @@
 <parameter name='tmp.vf-module-topology.aic-cloud-region' value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />

 </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 = 'Rackspace' AND 

 		     cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region"

         pfx='aai.cloud-region' local-only='false' >

 

@@ -534,7 +534,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service-
 <parameter name="field3" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`"/>

 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>

 </record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"

-key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id, vm_name, cloud_region_id, cloud_owner) VALUES ( $service-data.vnfs.vnf[$vnf-index].vnf-id , $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name , $service-data.service-information.service-instance-id , $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index] , $tmp.vf-module-topology.aic-cloud-region , 'att-aic')" ><outcome value='failure'>

+key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id, vm_name, cloud_region_id, cloud_owner) VALUES ( $service-data.vnfs.vnf[$vnf-index].vnf-id , $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name , $service-data.service-information.service-instance-id , $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index] , $tmp.vf-module-topology.aic-cloud-region , 'Rackspace')" ><outcome value='failure'>

 <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

 <parameter name="logger" value="message-log"/>

 <parameter name="field1" value="__TIMESTAMP__"/>

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..73291628 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
@@ -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 = 'Rackspace' 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 = 'Rackspace' 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' >

@@ -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="Rackspace" />

     <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" />