X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fxml%2FDataChange_update-network-to-aai.xml;h=839e15dea6f02d316b367ec1c5ec89dfcc626524;hb=45d198493727a8907f011a7eb49b2259037f690b;hp=17be19ec424b8d814f9f2e388f61aba5832dc9b0;hpb=88bc56aa8d3024f686fb7798294462837c31cac0;p=sdnc%2Foam.git

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 17be19ec..839e15de 100644
--- 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">
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-id"/>
+                <parameter name="outputPath" value="tmp.original-network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
+            <set>
+                <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>
+            </set>
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
                 <parameter name="network-id" value="`$tmp.network-id`"/>
                 <parameter name="client-id" value="`$network.client-id`"/>
@@ -15,6 +18,9 @@
                 <parameter name="network-type" value="`$network.network-types`"/>
             </save>
             <for index="pidx" start="0" end="`$network.node_length`">
+                <set>
+                    <parameter name="node." value=""/>
+                </set>
                 <set>
                     <parameter name="node." value="`$network.node[$pidx].`"/>
                     <parameter name="unique-networkId" value="`$tmp.network-id`"/>
@@ -38,13 +44,16 @@
                     </outcome>
                     <outcome value="Other">
                         <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
+                            <set>
+                                <parameter name="ttp." value=""/>
+                            </set>
                             <set>
                                 <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
                             </set>
                             <set>
                                 <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
                             </set>
-                            <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">
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
                                 <parameter name="ttp-id" value="`$unique-ttpId`"/>
                                 <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
                                 <parameter name="name" value="`$ttp.name`"/>
@@ -58,7 +67,7 @@
                                     <block/>
                                 </outcome>
                                 <outcome value="failure">
-                                    <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">
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
                                         <parameter name="ttp-id" value="`$unique-ttpId`"/>
                                         <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
                                         <parameter name="name" value="`$ttp.name`"/>
@@ -72,18 +81,43 @@
                                 </outcome>
                             </save>
                             <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">
-                                <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>
-                                <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`"/>
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
-                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+                                <parameter name="`relationship-list.relationship[$ttidx].related-to`" value="tunnel-termination-point"/>
+                                <!--
+                                <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`" />
+                                -->
+                                <parameter name="`relationship-list.relationship[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id"/>
+                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`"/>
+                                <outcome value="success">
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+                                        <parameter name="field1" value="__TIMESTAMP__"/>
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>
+                                        <parameter name="field5" value="sucessfully saved ttp"/>
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+                                    </record>
+                                </outcome>
+                                <outcome value="failure">
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+                                        <parameter name="field1" value="__TIMESTAMP__"/>
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>
+                                        <parameter name="field5" value="failuire on saving ttp"/>
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+                                    </record>
+                                </outcome>
                             </save>
                         </for>
                     </outcome>
                 </switch>
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/onap/hesamlogx.txt"/>
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
                     <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="sucess executing Hesam hesam log file"/>
+                    <parameter name="field2" value="sucess executing Hesam log file"/>
                     <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
                     <parameter name="field4" value="`$node.termination-point_length`"/>
                 </record>
@@ -108,12 +142,36 @@
                     </outcome>
                     <outcome value="Other">
                         <for index="tidx" start="0" end="`$node.termination-point_length`">
+                            <set>
+                                <parameter name="tp." value=""/>
+                            </set>
                             <set>
                                 <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
                             </set>
                             <set>
                                 <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
                             </set>
+                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="tmp.decoded-plug-id" value=""/>
+                                    </set>
+                                </outcome>
+                                <outcome value="false">
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">
+                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>
+                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>
+                                        <outcome value="success">
+                                            <block/>
+                                        </outcome>
+                                        <outcome value="failure">
+                                            <set>
+                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                            </set>
+                                        </outcome>
+                                    </execute>
+                                </outcome>
+                            </switch>
                             <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">
                                 <parameter name="interface-name" value="`$unique-ltpId`"/>
                                 <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
@@ -122,7 +180,10 @@
                                 <parameter name="operational-status" value="`$tp.te.oper-status`"/>
                                 <parameter name="in-maint" value="true"/>
                                 <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
-                                <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                <!--
+                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+                                -->
+                                <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
                                 <outcome value="success">
                                     <block/>
                                 </outcome>
@@ -135,7 +196,10 @@
                                         <parameter name="operational-status" value="`$tp.te.oper-status`"/>
                                         <parameter name="in-maint" value="true"/>
                                         <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
-                                        <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                        <!--
+                                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+                                        -->
+                                        <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
                                     </update>
                                 </outcome>
                             </save>