NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay resources).

[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..9039685 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
@@ -1,88 +1,99 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
-    <method rpc="update-tp-ttp-relationship" mode="sync">\r
+<service-logic\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
+    <method rpc='update-tp-ttp-relationship' mode='sync'>\r
         <block atomic="true">\r
-            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\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
+            <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
-            <for index="pethidx" start="0" end="`$network-eth.node_length`">\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
+                    <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
-                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>\r
+                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\r
                 </set>\r
-                <switch test="`$node-eth.termination-point_length`">\r
-                    <outcome value="">\r
-                        <block/>\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
+                    <outcome value=''>\r
+                        <block></block>\r
                     </outcome>\r
-                    <outcome value="0">\r
-                        <block/>\r
+                    <outcome value='0'>\r
+                        <block></block>\r
                     </outcome>\r
-                    <outcome value="Other">\r
-                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">\r
+                    <outcome value='Other'>\r
+                        <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\r
                             <set>\r
-                                <parameter name="tp-eth." value=""/>\r
+                                <parameter name='tp-eth.' value='' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>\r
+                                <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>\r
+                                <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />\r
                             </set>\r
                             <set>\r
-                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>\r
+                                <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\r
                             </set>\r
-                            <for index="potnidx" start="0" end="`$network-otn.node_length`">\r
+                            <for index='potnidx' start='0' end='`$network-otn.node_length`' >\r
+                                <set>\r
+                                    <parameter name='node-otn.' value='' />\r
+                                    <parameter name='unique-network-otnId' value='' />\r
+                                    <parameter name='unique-node-otnId' value="" />\r
+                                </set>\r
                                 <set>\r
-                                    <parameter name="node-otn." value=""/>\r
-                                    <parameter name="unique-network-otnId" value=""/>\r
-                                    <parameter name="unique-node-otnId" value=""/>\r
+                                    <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>\r
+                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>\r
-                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>\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
-                                    <outcome value="">\r
-                                        <block/>\r
+                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>\r
+                                    <outcome value=''>\r
+                                        <block></block>\r
                                     </outcome>\r
-                                    <outcome value="0">\r
-                                        <block/>\r
+                                    <outcome value='0'>\r
+                                        <block></block>\r
                                     </outcome>\r
-                                    <outcome value="Other">\r
-                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">\r
+                                    <outcome value='Other'>\r
+                                        <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\r
                                             <set>\r
-                                                <parameter name="ttp." value=""/>\r
+                                                <parameter name='ttp.' value='' />\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>\r
+                                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
+                                                <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`' />\r
                                             </set>\r
-                                            <switch test="`$tp-inter-layer-lock-id`">\r
-                                                <outcome value="`$ttp-inter-layer-lock-id`">\r
-                                                    <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">\r
-                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>\r
-                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>\r
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>\r
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
+                                            <switch test='`$tp-inter-layer-lock-id`'>\r
+                                                <outcome value='`$ttp-inter-layer-lock-id`'>\r
+                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \r
+      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">\r
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />\r
+                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />\r
                                                     </save>\r
                                                 </outcome>\r
                                             </switch>\r