Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug fixing in topology discovery as part of CCVPN (Cross-Layer Cross-Domain VPN)...
[sdnc/oam.git] / platform-logic / datachange / src / main / xml / DataChange_update-network-to-aai.xml
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 17be19e..839e15d 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -3,10 +3,13 @@
         <block atomic="true">\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network.network-id`"/>\r
-                <parameter name="outputPath" value="tmp.network-id"/>\r
+                <parameter name="outputPath" value="tmp.original-network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
+            <set>\r
+                <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>\r
+            </set>\r
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">\r
                 <parameter name="network-id" value="`$tmp.network-id`"/>\r
                 <parameter name="client-id" value="`$network.client-id`"/>\r
@@ -15,6 +18,9 @@
                 <parameter name="network-type" value="`$network.network-types`"/>\r
             </save>\r
             <for index="pidx" start="0" end="`$network.node_length`">\r
+                <set>\r
+                    <parameter name="node." value=""/>\r
+                </set>\r
                 <set>\r
                     <parameter name="node." value="`$network.node[$pidx].`"/>\r
                     <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
@@ -38,13 +44,16 @@
                     </outcome>\r
                     <outcome value="Other">\r
                         <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">\r
+                            <set>\r
+                                <parameter name="ttp." value=""/>\r
+                            </set>\r
                             <set>\r
                                 <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>\r
                             </set>\r
                             <set>\r
                                 <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
                             </set>\r
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
                                 <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
                                 <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
                                 <parameter name="name" value="`$ttp.name`"/>\r
@@ -58,7 +67,7 @@
                                     <block/>\r
                                 </outcome>\r
                                 <outcome value="failure">\r
-                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
                                         <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
                                         <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
                                         <parameter name="name" value="`$ttp.name`"/>\r
@@ -72,18 +81,43 @@
                                 </outcome>\r
                             </save>\r
                             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">\r
-                                <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>\r
-                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>\r
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
+                                <parameter name="`relationship-list.relationship[$ttidx].related-to`" value="tunnel-termination-point"/>\r
+                                <!--\r
+                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />\r
+                                -->\r
+                                <parameter name="`relationship-list.relationship[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id"/>\r
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`"/>\r
+                                <outcome value="success">\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="sucessfully saved ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
+                                    </record>\r
+                                </outcome>\r
+                                <outcome value="failure">\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="failuire on saving ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
+                                    </record>\r
+                                </outcome>\r
                             </save>\r
                         </for>\r
                     </outcome>\r
                 </switch>\r
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                    <parameter name="file" value="/opt/onap/hesamlogx.txt"/>\r
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
                     <parameter name="field1" value="__TIMESTAMP__"/>\r
-                    <parameter name="field2" value="sucess executing Hesam hesam log file"/>\r
+                    <parameter name="field2" value="sucess executing Hesam log file"/>\r
                     <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
                     <parameter name="field4" value="`$node.termination-point_length`"/>\r
                 </record>\r
@@ -108,12 +142,36 @@
                     </outcome>\r
                     <outcome value="Other">\r
                         <for index="tidx" start="0" end="`$node.termination-point_length`">\r
+                            <set>\r
+                                <parameter name="tp." value=""/>\r
+                            </set>\r
                             <set>\r
                                 <parameter name="tp." value="`$node.termination-point[$tidx].`"/>\r
                             </set>\r
                             <set>\r
                                 <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>\r
                             </set>\r
+                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">\r
+                                <outcome value="true">\r
+                                    <set>\r
+                                        <parameter name="tmp.decoded-plug-id" value=""/>\r
+                                    </set>\r
+                                </outcome>\r
+                                <outcome value="false">\r
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">\r
+                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>\r
+                                        <outcome value="success">\r
+                                            <block/>\r
+                                        </outcome>\r
+                                        <outcome value="failure">\r
+                                            <set>\r
+                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                </outcome>\r
+                            </switch>\r
                             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">\r
                                 <parameter name="interface-name" value="`$unique-ltpId`"/>\r
                                 <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
@@ -122,7 +180,10 @@
                                 <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
                                 <parameter name="in-maint" value="true"/>\r
                                 <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
-                                <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                <!--\r
+                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
+                                -->\r
+                                <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
                                 <outcome value="success">\r
                                     <block/>\r
                                 </outcome>\r
@@ -135,7 +196,10 @@
                                         <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
                                         <parameter name="in-maint" value="true"/>\r
                                         <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
-                                        <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                        <!--\r
+                                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
+                                        -->\r
+                                        <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
                                     </update>\r
                                 </outcome>\r
                             </save>\r
SDNC OA&M tools