Merge "DG changes for the closed loop and async support in MDONS"

[sdnc/oam.git] / 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 b9dbae7..4ce3362 100644 (file)
--- 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
@@ -3,22 +3,28 @@
         <block atomic="true">\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-eth.network-id`"/>\r
-                <parameter name="outputPath" value="tmp.network-eth.network-id"/>\r
+                <parameter name="outputPath" value="tmp.original-network-eth.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-otn.network-id`"/>\r
-                <parameter name="outputPath" value="tmp.network-otn.network-id"/>\r
+                <parameter name="outputPath" value="tmp.original-network-otn.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
+            <set>\r
+                <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>\r
+                <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>\r
+            </set>\r
             <for index="pethidx" start="0" end="`$network-eth.node_length`">\r
                 <set>\r
                     <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>\r
                 </set>\r
                 <set>\r
                     <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>\r
+                </set>\r
+                <set>\r
                     <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>\r
                 </set>\r
                 <switch test="`$node-eth.termination-point_length`">\r
@@ -53,6 +59,8 @@
                                 </set>\r
                                 <set>\r
                                     <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>\r
+                                </set>\r
+                                <set>\r
                                     <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>\r
                                 </set>\r
                                 <switch test="`$node-otn.te.tunnel-termination-point_length`">\r
@@ -74,7 +82,7 @@
                                                 <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`"/>\r
+                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>\r
                                             </set>\r
                                             <switch test="`$tp-inter-layer-lock-id`">\r
                                                 <outcome value="`$ttp-inter-layer-lock-id`">\r