From fac0133e017e76e2d48d86be50b829db45b371f8 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Sat, 4 Nov 2017 12:06:28 +0000
Subject: Change Rackspace to CloudOwner

Issue-ID: SDNC-170
Change-Id: If64c4f12c503ac2d58b0de7d6750015162545216
Signed-off-by: Brian Freeman <bf1936@att.com>

Former-commit-id: 9973bf478f9ffa5a89fc0c8b84e485876324df80
---
 .../vnfapi/src/main/xml/VNF-API_network-topology-assign.xml           | 4 ++--
 .../src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'platform-logic/vnfapi/src/main/xml')

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
index 70fbf6a0..76988ef7 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
@@ -138,14 +138,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="Rackspace" />
+    <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="`$network-topology-operation-input.network-request-information.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-information.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="Rackspace" />
+    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="CloudOwner" />
     <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-information.aic-cloud-region`" /><outcome value='failure'>
 <block atomic='true'><set>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
index 00a4dc97..7ce6b2d2 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
@@ -23,7 +23,7 @@
     <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vnf-topology-operation-input.vnf-request-information.model-customization-uuid`" />
 </return></outcome></get-resource><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="cloud-region" 
-		key="cloud-region.cloud-owner = 'Rackspace' AND 
+		key="cloud-region.cloud-owner = 'CloudOwner' AND 
 		     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-information.aic-cloud-region"
         pfx='aai.cloud-region' local-only='false' >
 
@@ -330,7 +330,7 @@
 		$vnf-topology-operation-input.service-information.service-instance-id , 
 		$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name , 
 		$vnf-topology-operation.vnf-request-information.aic-cloud-region , 
-		'Rackspace')" ><outcome value='failure'>
+		'CloudOwner')" ><outcome value='failure'>
 <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
 <parameter name="logger" value="message-log"/>
 <parameter name="field1" value="__TIMESTAMP__"/>
-- 
cgit 1.2.3-korg