From ccf839a4815dc7e26deaf36627d04c0a4587780b Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 7 May 2020 18:16:58 +0000
Subject: NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay
 resources).

- This is needed for F release

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

Former-commit-id: f515a8831e0036414d69d73030e871dec88180f8
---
 .../xml/DataChange_update-tp-ttp-relationship.xml  | 103 ++++++++++++---------
 1 file changed, 57 insertions(+), 46 deletions(-)

(limited to 'platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml')

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
index b9dbae7a..90396852 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
@@ -1,88 +1,99 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
-    <method rpc="update-tp-ttp-relationship" mode="sync">
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+    <method rpc='update-tp-ttp-relationship' mode='sync'>
         <block atomic="true">
-            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                 <parameter name="source" value="`$network-eth.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-eth.network-id"/>
+                <parameter name="outputPath" value="tmp.original-network-eth.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
-            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                 <parameter name="source" value="`$network-otn.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-otn.network-id"/>
+                <parameter name="outputPath" value="tmp.original-network-otn.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
-            <for index="pethidx" start="0" end="`$network-eth.node_length`">
+            <set>
+                <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />
+                <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />
+            </set>
+            <for index='pethidx' start='0' end='`$network-eth.node_length`' >
                 <set>
-                    <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>
+                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
                 </set>
                 <set>
-                    <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
-                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
+                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
                 </set>
-                <switch test="`$node-eth.termination-point_length`">
-                    <outcome value="">
-                        <block/>
+                <set>
+                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+                </set>
+                <switch test='`$node-eth.termination-point_length`'>
+                    <outcome value=''>
+                        <block></block>
                     </outcome>
-                    <outcome value="0">
-                        <block/>
+                    <outcome value='0'>
+                        <block></block>
                     </outcome>
-                    <outcome value="Other">
-                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
+                    <outcome value='Other'>
+                        <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
                             <set>
-                                <parameter name="tp-eth." value=""/>
+                                <parameter name='tp-eth.' value='' />
                             </set>
                             <set>
-                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
+                                <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
                             </set>
                             <set>
-                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>
+                                <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
                             </set>
                             <set>
-                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>
+                                <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
                             </set>
-                            <for index="potnidx" start="0" end="`$network-otn.node_length`">
+                            <for index='potnidx' start='0' end='`$network-otn.node_length`' >
+                                <set>
+                                    <parameter name='node-otn.' value='' />
+                                    <parameter name='unique-network-otnId' value='' />
+                                    <parameter name='unique-node-otnId' value="" />
+                                </set>
                                 <set>
-                                    <parameter name="node-otn." value=""/>
-                                    <parameter name="unique-network-otnId" value=""/>
-                                    <parameter name="unique-node-otnId" value=""/>
+                                    <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
                                 </set>
                                 <set>
-                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>
+                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
                                 </set>
                                 <set>
-                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>
-                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>
+                                    <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
                                 </set>
-                                <switch test="`$node-otn.te.tunnel-termination-point_length`">
-                                    <outcome value="">
-                                        <block/>
+                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>
+                                    <outcome value=''>
+                                        <block></block>
                                     </outcome>
-                                    <outcome value="0">
-                                        <block/>
+                                    <outcome value='0'>
+                                        <block></block>
                                     </outcome>
-                                    <outcome value="Other">
-                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
+                                    <outcome value='Other'>
+                                        <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >
                                             <set>
-                                                <parameter name="ttp." value=""/>
+                                                <parameter name='ttp.' value='' />
                                             </set>
                                             <set>
-                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>
+                                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
                                             </set>
                                             <set>
-                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+                                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
                                             </set>
                                             <set>
-                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`"/>
+                                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
                                             </set>
-                                            <switch test="`$tp-inter-layer-lock-id`">
-                                                <outcome value="`$ttp-inter-layer-lock-id`">
-                                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface:relationship-list" key="p-interface.interface-name = $unique-ltpethId" force="true" pfx="tmp.AnAI-data">
-                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
-                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+                                            <switch test='`$tp-inter-layer-lock-id`'>
+                                                <outcome value='`$ttp-inter-layer-lock-id`'>
+                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' 
+      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
+                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
                                                     </save>
                                                 </outcome>
                                             </switch>
-- 
cgit 1.2.3-korg