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=5a0255de5b6fee9a19211c739f31d99a7a41f606;hb=f515a8831e0036414d69d73030e871dec88180f8;hp=f9b7d99740e7eadc109343f461703b415322259c;hpb=6f6176c4f74c5cf128077a14b9dd085ec0f346e9;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 f9b7d997..5a0255de 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
@@ -5,10 +5,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`' />
@@ -85,11 +88,11 @@
                             </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[0].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`" />
+                                <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.ttp-id" />
+                                <parameter name="relationship-list.relationship[0].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" />
@@ -156,6 +159,27 @@
                             <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></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' >
@@ -166,7 +190,8 @@
                                 <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></block>
                                 </outcome>
@@ -181,7 +206,8 @@
                                         <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>