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

[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 f9b7d99..5a0255d 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
@@ -5,10 +5,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'  \r
      key='network-resource.network-id = $tmp.network-id' >\r
                 <parameter name='network-id' value='`$tmp.network-id`' />\r
@@ -85,11 +88,11 @@
                             </save>\r
                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
       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[0].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].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
+                                <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.ttp-id" />\r
+                                <parameter name="relationship-list.relationship[0].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
@@ -156,6 +159,27 @@
                             <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></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' \r
       key='pnf.pnf-name = $unique-nodeId\r
       AND p-interface.interface-name = $unique-ltpId' >\r
@@ -166,7 +190,8 @@
                                 <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
+                                <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\r
+                                <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\r
                                 <outcome value='success'>\r
                                     <block></block>\r
                                 </outcome>\r
@@ -181,7 +206,8 @@
                                         <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
+                                        <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\r
+                                        <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\r
                                     </update>\r
                                 </outcome>\r
                             </save>\r