From fb18306b26c323d9f0fbe8e0b5f049e9ed85f75e Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 13 May 2020 05:07:55 +0000
Subject: Adding local-link-connectivity-list (llcl) information to match ttp
 and tp locally (to support NNI-based Service creation use-case).

    - This is needed for F release

Issue-ID: SDNC-1184
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I24f1ef56884b874baed029182a984945080af769

Former-commit-id: 4ff90dd1689d772865399ab5a995119981b127e1
---
 .../main/xml/DataChange_update-network-to-aai.xml  | 376 ++++++++++++---------
 .../xml/DataChange_update-tp-ttp-relationship.xml  |  95 +++---
 2 files changed, 255 insertions(+), 216 deletions(-)

(limited to 'platform-logic/datachange/src/main/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 5a0255de..afe1fc0e 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
@@ -1,221 +1,263 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
-    <method rpc='update-network-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-network-to-aai" mode="sync">
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network.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`" />
+                <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`' />
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />
-                <parameter name='provider-id' value='`$network.provider-id`' />
-                <parameter name='network-type' value='`$network.network-types`' />
+            <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`"/>
+                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
+                <parameter name="provider-id" value="`$network.provider-id`"/>
+                <parameter name="network-type" value="`$network.network-types`"/>
             </save>
-            <for index='pidx' start='0' end='`$network.node_length`' >
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                <outcome value="success">
+                    <block>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource:relationship-list" key="network-resource.network-id = $tmp.network-id" force="true" pfx="tmp.AnAI-data">
+                            <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc"/>
+                            <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id"/>
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`"/>
+                            <!--
+                            /aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2
+                            -->
+                        </save>
+                    </block>
+                </outcome>
+                <outcome value="not-found">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+                    </return>
+                </outcome>
+                <outcome value="Other">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+                    </return>
+                </outcome>
+            </get-resource>
+            <for index="pidx" start="0" end="`$network.node_length`">
                 <set>
-                    <parameter name='node.' value='' />
+                    <parameter name="node." value=""/>
                 </set>
                 <set>
-                    <parameter name='node.' value='`$network.node[$pidx].`' />
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
+                    <parameter name="node." value="`$network.node[$pidx].`"/>
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
                 </set>
                 <set>
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
-      key='pnf.pnf-name = $unique-nodeId' >
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />
-                    <parameter name='pnf-id' value='`$node.node-id`' />
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
-                    <parameter name='in-maint' value='true' />
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>
+                    <parameter name="pnf-id" value="`$node.node-id`"/>
+                    <parameter name="operational-status" value="`$node.te.oper-status`"/>
+                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
+                    <parameter name="in-maint" value="true"/>
                 </save>
-                <switch test='`$node.te.tunnel-termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node.termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="tidx" start="0" end="`$node.termination-point_length`">
                             <set>
-                                <parameter name='ttp.' value='' />
+                                <parameter name="tp." value=""/>
                             </set>
                             <set>
-                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
+                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
                             </set>
-                            <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`' />
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />
-                                <parameter name='encoding' value='`$ttp.encoding`' />
-                                <outcome value='success'>
-                                    <block></block>
+                            <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='failure'>
-                                    <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`' />
-                                        <parameter name='admin-status' value='`$ttp.admin-status`' />
-                                        <parameter name='oper-status' value='`$ttp.oper-status`' />
-                                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                                        <parameter name='protection-type' value='`$ttp.protection-type`' />
-                                        <parameter name='encoding' value='`$ttp.encoding`' />
-                                    </update>
+                                <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>
-                            </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[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[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" />
-                                        <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>
+                            </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`"/>
+                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+                                <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="`$tmp.decoded-plug-id`"/>
+                                <outcome value="success">
+                                    <block/>
                                 </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 value="failure">
+                                    <update 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`"/>
+                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+                                        <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="`$tmp.decoded-plug-id`"/>
+                                    </update>
                                 </outcome>
                             </save>
                         </for>
                     </outcome>
                 </switch>
-                <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`" />
-                </record>
-                <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[0].related-to" value="network-resource" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
+                <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[0].related-to" value="network-resource"/>
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>
                 </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 
-      force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>
                 </save>
-                <switch test='`$node.termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node.te.tunnel-termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='tidx' start='0' end='`$node.termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
                             <set>
-                                <parameter name='tp.' value='' />
+                                <parameter name="ttp." value=""/>
                             </set>
                             <set>
-                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-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>
+                            <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`"/>
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                <parameter name="encoding" value="`$ttp.encoding`"/>
+                                <outcome value="success">
+                                    <block/>
                                 </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 value="failure">
+                                    <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`"/>
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>
+                                    </update>
                                 </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`' />
-                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
-                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
-                                <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='`$tmp.decoded-plug-id`' />
-                                <outcome value='success'>
-                                    <block></block>
+                            </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[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[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"/>
+                                        <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'>
-                                    <update 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`' />
-                                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
-                                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
-                                        <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='`$tmp.decoded-plug-id`' />
-                                    </update>
+                                <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>
+                            <switch test="`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`">
+                                <outcome value="">
+                                    <block/>
+                                </outcome>
+                                <outcome value="0">
+                                    <block/>
+                                </outcome>
+                                <outcome value="Other">
+                                    <block>
+                                        <set>
+                                            <parameter name="unique-ltpId-second" value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`"/>
+                                        </set>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point:relationship-list" key="tunnel-termination-point.ttp-id = $unique-ttpId" force="true" pfx="tmp.AnAI-data">
+                                            <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`"/>
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`"/>
+                                        </save>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </for>
                     </outcome>
                 </switch>
+                <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`"/>
+                </record>
             </for>
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
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 90396852..4ce33625 100644
--- 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,99 +1,96 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
-    <method rpc='update-tp-ttp-relationship' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-tp-ttp-relationship" mode="sync">
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network-eth.network-id`"/>
                 <parameter name="outputPath" value="tmp.original-network-eth.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network-otn.network-id`"/>
                 <parameter name="outputPath" value="tmp.original-network-otn.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
             <set>
-                <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />
-                <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />
+                <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>
+                <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>
             </set>
-            <for index='pethidx' start='0' end='`$network-eth.node_length`' >
+            <for index="pethidx" start="0" end="`$network-eth.node_length`">
                 <set>
-                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
+                    <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>
                 </set>
                 <set>
-                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
+                    <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
                 </set>
                 <set>
-                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
                 </set>
-                <switch test='`$node-eth.termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node-eth.termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
                             <set>
-                                <parameter name='tp-eth.' value='' />
+                                <parameter name="tp-eth." value=""/>
                             </set>
                             <set>
-                                <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
+                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
+                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>
                             </set>
                             <set>
-                                <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
+                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>
                             </set>
-                            <for index='potnidx' start='0' end='`$network-otn.node_length`' >
+                            <for index="potnidx" start="0" end="`$network-otn.node_length`">
                                 <set>
-                                    <parameter name='node-otn.' value='' />
-                                    <parameter name='unique-network-otnId' value='' />
-                                    <parameter name='unique-node-otnId' value="" />
+                                    <parameter name="node-otn." value=""/>
+                                    <parameter name="unique-network-otnId" value=""/>
+                                    <parameter name="unique-node-otnId" value=""/>
                                 </set>
                                 <set>
-                                    <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
+                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>
                                 </set>
                                 <set>
-                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
+                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>
                                 </set>
                                 <set>
-                                    <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
+                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>
                                 </set>
-                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>
-                                    <outcome value=''>
-                                        <block></block>
+                                <switch test="`$node-otn.te.tunnel-termination-point_length`">
+                                    <outcome value="">
+                                        <block/>
                                     </outcome>
-                                    <outcome value='0'>
-                                        <block></block>
+                                    <outcome value="0">
+                                        <block/>
                                     </outcome>
-                                    <outcome value='Other'>
-                                        <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >
+                                    <outcome value="Other">
+                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
                                             <set>
-                                                <parameter name='ttp.' value='' />
+                                                <parameter name="ttp." value=""/>
                                             </set>
                                             <set>
-                                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
+                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>
                                             </set>
                                             <set>
-                                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
                                             </set>
                                             <set>
-                                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
+                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>
                                             </set>
-                                            <switch test='`$tp-inter-layer-lock-id`'>
-                                                <outcome value='`$ttp-inter-layer-lock-id`'>
-                                                    <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">
-                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
-                                                        <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.tunnel-tp-id" />
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
+                                            <switch test="`$tp-inter-layer-lock-id`">
+                                                <outcome value="`$ttp-inter-layer-lock-id`">
+                                                    <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">
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
+                                                        <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.tunnel-tp-id"/>
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
                                                     </save>
                                                 </outcome>
                                             </switch>
-- 
cgit 1.2.3-korg