From 7f70731621bcd7cdb4f4157eba0d66b3638f1519 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat" <kc1472@att.com>
Date: Thu, 4 Oct 2018 18:35:55 +0000
Subject: self-serve dg patch

inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name

Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136
Issue-ID: CCSDK-604
Signed-off-by: Cheung, Pat <kc1472@att.com>

Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815
---
 ...C-RESOURCE-API_self-serve-aai-vf-module-put.xml | 30 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
index acbda514..2cf8ee17 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
@@ -4241,11 +4241,17 @@
                                                     <parameter name="field1" value="ROLLBACK VNF l3-network relationship"/>
                                                 </record>
                                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >
+                                                    <set>
+                                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+                                                        <!--
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+-->
+                                                    </set>
                                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf:relationship-list" 
 		key="generic-vnf.vnf-id = $ss.param.vnf-id 
 		AND related-to = l3-network 
-		AND l3-network.network-id = $ss.network[$n].netid" >
+		AND relationship.related-link = $tmp.related-link" >
                                                         <outcome value='failure'>
                                                             <block atomic='true'>
                                                                 <set>
@@ -4269,7 +4275,7 @@
                                                         </outcome>
                                                         <outcome value='not-found'>
                                                             <set>
-                                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />
+                                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />
                                                             </set>
                                                         </outcome>
                                                         <outcome value='success'>
@@ -4575,11 +4581,17 @@
                                                     <parameter name="field1" value="ROLLBACK VNF l3-network relationship"/>
                                                 </record>
                                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >
+                                                    <set>
+                                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+                                                        <!--
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+-->
+                                                    </set>
                                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf:relationship-list" 
 		key="generic-vnf.vnf-id = $ss.param.vnf-id 
 		AND related-to = l3-network 
-		AND l3-network.network-id = $ss.network[$n].netid" >
+		AND relationship.related-link = $tmp.related-link" >
                                                         <outcome value='failure'>
                                                             <block atomic='true'>
                                                                 <set>
@@ -4603,7 +4615,7 @@
                                                         </outcome>
                                                         <outcome value='not-found'>
                                                             <set>
-                                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />
+                                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />
                                                             </set>
                                                         </outcome>
                                                         <outcome value='success'>
@@ -4971,11 +4983,17 @@
                                     <parameter name="field1" value="ROLLBACK VNF l3-network relationship"/>
                                 </record>
                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >
+                                    <set>
+                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+                                        <!--
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />
+-->
+                                    </set>
                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf:relationship-list" 
 		key="generic-vnf.vnf-id = $ss.param.vnf-id 
 		AND related-to = l3-network 
-		AND l3-network.network-id = $ss.network[$n].netid" >
+		AND relationship.related-link = $tmp.related-link" >
                                         <outcome value='failure'>
                                             <block atomic='true'>
                                                 <set>
@@ -4999,7 +5017,7 @@
                                         </outcome>
                                         <outcome value='not-found'>
                                             <set>
-                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />
+                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />
                                             </set>
                                         </outcome>
                                         <outcome value='success'>
-- 
cgit 1.2.3-korg