self-serve dg patch

[sdnc/oam.git] / 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 acbda51..2cf8ee1 100644 (file)
--- 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"/>\r
                                                 </record>\r
                                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >\r
+                                                    <set>\r
+                                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+                                                        <!--\r
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+-->\r
+                                                    </set>\r
                                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf:relationship-list" \r
                key="generic-vnf.vnf-id = $ss.param.vnf-id \r
                AND related-to = l3-network \r
-               AND l3-network.network-id = $ss.network[$n].netid" >\r
+               AND relationship.related-link = $tmp.related-link" >\r
                                                         <outcome value='failure'>\r
                                                             <block atomic='true'>\r
                                                                 <set>\r
@@ -4269,7 +4275,7 @@
                                                         </outcome>\r
                                                         <outcome value='not-found'>\r
                                                             <set>\r
-                                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />\r
+                                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />\r
                                                             </set>\r
                                                         </outcome>\r
                                                         <outcome value='success'>\r
@@ -4575,11 +4581,17 @@
                                                     <parameter name="field1" value="ROLLBACK VNF l3-network relationship"/>\r
                                                 </record>\r
                                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >\r
+                                                    <set>\r
+                                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+                                                        <!--\r
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+-->\r
+                                                    </set>\r
                                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf:relationship-list" \r
                key="generic-vnf.vnf-id = $ss.param.vnf-id \r
                AND related-to = l3-network \r
-               AND l3-network.network-id = $ss.network[$n].netid" >\r
+               AND relationship.related-link = $tmp.related-link" >\r
                                                         <outcome value='failure'>\r
                                                             <block atomic='true'>\r
                                                                 <set>\r
@@ -4603,7 +4615,7 @@
                                                         </outcome>\r
                                                         <outcome value='not-found'>\r
                                                             <set>\r
-                                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />\r
+                                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />\r
                                                             </set>\r
                                                         </outcome>\r
                                                         <outcome value='success'>\r
@@ -4971,11 +4983,17 @@
                                     <parameter name="field1" value="ROLLBACK VNF l3-network relationship"/>\r
                                 </record>\r
                                 <for silentFailure='true' index='n' start='0' end='`$nidx`' >\r
+                                    <set>\r
+                                        <parameter name='tmp.related-link' value="`'/aai/v$/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+                                        <!--\r
+<parameter name='tmp.related-link' value="`'/aai/' + $prop.aai.version + '/network/l3-networks/l3-network/' + $ss.network[$n].netid`" />\r
+-->\r
+                                    </set>\r
                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
        resource="generic-vnf:relationship-list" \r
                key="generic-vnf.vnf-id = $ss.param.vnf-id \r
                AND related-to = l3-network \r
-               AND l3-network.network-id = $ss.network[$n].netid" >\r
+               AND relationship.related-link = $tmp.related-link" >\r
                                         <outcome value='failure'>\r
                                             <block atomic='true'>\r
                                                 <set>\r
@@ -4999,7 +5017,7 @@
                                         </outcome>\r
                                         <outcome value='not-found'>\r
                                             <set>\r
-                                                <parameter name='error-message' value="`$error-message + ' generic-vnf.vnfid = ' + $ss.param.vnf-id + ' not found in AAI. Consider silent success!'`" />\r
+                                                <parameter name='error-message' value="`$error-message + ' l3-network relationship with related-path = ' + $tmp.related-path  + ' not found in AAI. Consider silent success!'`" />\r
                                             </set>\r
                                         </outcome>\r
                                         <outcome value='success'>\r