From 71eb3ab680b9d51cfd6fb324d49bcd09c6ff7464 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Tue, 27 Apr 2021 16:33:33 +0000
Subject: Bug fixing required for H release. 1) fixing and issue in the modify
 operation 2) fixing automatic loading of the delete/deallocate DG 3) fixing
 ESR registration issue

Issue-ID: SDNC-1528
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I2c95d00c400559d8aae57b106bcde3886ed096a6

Former-commit-id: 79ad1bea4f5f5dc831e3d4159b21a3028ef775b3
---
 ...i-vnf-topology-operation-trans-slice-modify.xml | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
index 1205c97a..6d57a785 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml
@@ -33,16 +33,26 @@
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnfs"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopopnfs" ></get-resource>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-links"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
                                     <parameter name='tmp.arr' value='' />
                                     <parameter name='tmp.arridx' value='0' />
                                     <parameter name='tmp.arr_length' value='0' />
                                     <parameter name='otn-tunnel-slice' value='' />
                                     <parameter name='otn-tunnel-slice_length' value='0' />
-                                    <parameter name='tmp.slicevpns' value='' />
-                                    <parameter name='tmp.slicevpns_length' value='0' />
-                                    <parameter name='tmp.slicevpnuuids' value='' />
-                                    <parameter name='tmp.slicevpnuuids.' value='' />
+                                    <!--<parameter name='tmp.slicevpns' value='' />-->
+                                    <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
                                     <parameter name='bwModified' value='false' />
                                 </set>
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
@@ -835,6 +845,9 @@
                                                                                                         <parameter name='prop.ethsrvType' value='`$network-route-A`' />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                                                        <parameter name="filename" value="`$filenamemm`" />
+                                                                                                    </execute>
                                                                                                     <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
                                                                                                         <block atomic='true'>
                                                                                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
@@ -992,13 +1005,7 @@
                                                                                                                 <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
                                                                                                                 <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                                                 <outcome value='success'>
-                                                                                                                    <block>
-                                                                                                                        <set>
-                                                                                                                            <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />
-                                                                                                                            <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />
-                                                                                                                            <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />
-                                                                                                                        </set>
-                                                                                                                    </block>
+                                                                                                                    <block></block>
                                                                                                                 </outcome>
                                                                                                             </save>
                                                                                                             <switch test='`$otnidx == 0`'>
-- 
cgit 1.2.3-korg