From 4a2c8a2a33672c2c3570b934556874dd7feabfa4 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 31 Jul 2020 16:41:53 -0400
Subject: Support cloud-owner input param

If cloud-owner is passed in input, it should override the value
from properties file

Change-Id: I67b0e7e0b4fe546dbdfcaa24785ebd1b3b96e7b5
Issue-ID: SDNC-1260
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 131845c1b3185b5efb8b5bd287747c7086eface8
---
 .../GENERIC-RESOURCE-API_network-topology-operation-assign.xml   | 7 +++++++
 .../xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml   | 7 +++++++
 ...IC-RESOURCE-API_vf-module-topology-operation-assign-async.xml | 7 +++++++
 ...RIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml | 9 ++++++++-
 .../GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml | 7 +++++++
 5 files changed, 36 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml

(limited to 'platform-logic/generic-resource-api/src/main/xml')

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
old mode 100755
new mode 100644
index 1f6f5d85..5bccbb86
--- 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
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$network-topology-operation-input.network-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$network-topology-operation-input.network-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="tenant" 
 		key="cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND 
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
index f25087e9..dbc2203e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>
                 <outcome value=''>
                     <block></block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
index 923303a0..081a4e3b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <set>
                 <parameter name="so.ack-final-indicator" value="Y" />
                 <parameter name="so.response-code" value="500" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
index 52601479..9d1f3ca5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>
                 <outcome value=''>
                     <block></block>
@@ -1430,4 +1437,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
index 61b4226a..acb3c1ce 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vnf-topology-operation-input.vnf-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <set>
                 <parameter name="so.ack-final-indicator" value="Y" />
                 <parameter name="so.response-code" value="500" />
-- 
cgit 1.2.3-korg