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
---
 ...GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml |  44 ++-
 ...OURCE-API_sotn-get-otn-tunnel-path-from-oof.xml | 381 +++++++++++----------
 ...RESOURCE-API_sotn-vf-operation-uni-activate.xml | 277 ++++++++-------
 3 files changed, 399 insertions(+), 303 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/sotn_nni')

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
index c6505ad1..96f3843f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
@@ -48,6 +48,22 @@
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                            <!--<set>-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                         </set>
                     </block>
                 </outcome>
@@ -73,6 +89,22 @@
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                                    <!--<set>-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                                 </set>
                             </block>
                         </outcome>
@@ -81,13 +113,15 @@
             </execute>
             <switch test="`$prop.sdncRestApi.token_id`">
                 <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json"/>
                         <parameter name="httpMethod" value="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>
@@ -106,13 +140,15 @@
                     </execute>
                 </outcome>
                 <outcome value='Other'>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json"/>
                         <parameter name="httpMethod" value="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
index 7159b23a..3ea459a5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
@@ -1,13 +1,11 @@
-<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='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+    <method rpc="sotn-get-otn-tunnel-path-from-oof" mode="sync">
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
-                <parameter name="restapiUser" value="`$prop.oof.user`" />
-                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`"/>
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`"/>
+                <parameter name="restapiUser" value="`$prop.oof.user`"/>
+                <parameter name="restapiPassword" value="`$prop.oof.password`"/>
                 <parameter name="format" value="json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="otn-oof"/>
@@ -15,95 +13,106 @@
                 <parameter name="trustStorePassword" value="adminadmin"/>
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                 <parameter name="keyStorePassword" value="adminadmin"/>
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing OOF api" />
+                <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
+                <outcome value="failure">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="Error executing OOF api"/>
                     </return>
                 </outcome>
-                <outcome value='success'>
-                    <block></block>
+                <outcome value="success">
+                    <block/>
                 </outcome>
             </execute>
-            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
+            <for index="vidx" start="0" end="`$otn-oof.solutions_length`">
                 <block atomic="true">
                     <set>
-                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
+                        <parameter name="otn-oof.link-name" value="`$otn-oof.solutions[$vidx].link`"/>
                     </set>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="logical-link" 
-		key="logical-link.link-name = $otn-oof.link-name"
-        pfx='tmp.aai.cross-link' local-only='false' >
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $otn-oof.link-name" pfx="tmp.aai.cross-link" local-only="false">
                         <!--AND depth = '0'"-->
-                        <outcome value='success'>
+                        <outcome value="success">
                             <block>
-                                <switch test='`$tmp.aai.cross-link.link-role`'>
-                                    <outcome value='cross-domain'>
+                                <switch test="`$tmp.aai.cross-link.link-role`">
+                                    <outcome value="cross-domain">
                                         <block atomic="true">
-                                            <set>
-                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />
-                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />
-                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />
-                                            </set>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="p-interface" 
-		key="pnf.pnf-name = $tmp.src-pnf-name
-		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
-        pfx='tmp.aai.src-tp' local-only='false' >
+                                            <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
+                                                <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
+                                                    <outcome value="p-interface">
+                                                        <block>
+                                                            <set>
+                                                                <parameter name="tmp.cross-link.src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>
+                                                                <parameter name="tmp.cross-link.dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>
+                                                                <parameter name="tmp.src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>
+                                                                <parameter name="tmp.dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
+                                                            </set>
+                                                            <break/>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $tmp.src-pnf-name AND p-interface.interface-name = $tmp.cross-link.src-ltpId" pfx="tmp.aai.src-tp" local-only="false">
                                                 <!--AND depth = '0'"-->
-                                                <outcome value='success'>
+                                                <outcome value="success">
                                                     <block>
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="pnf.pnf-name = $tmp.src-pnf-name"
-        pfx='tmp.aai.src-pnf' local-only='false' >
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $tmp.src-pnf-name" pfx="tmp.aai.src-pnf" local-only="false">
                                                             <!--AND depth = '0'"-->
-                                                            <outcome value='success'>
+                                                            <outcome value="success">
                                                                 <block>
                                                                     <set>
-                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
-                                                                        <parameter name='domain-A.tpn' value='1' />
+                                                                        <parameter name="domain-A.node-id" value="`$tmp.aai.src-pnf.pnf-id`"/>
+                                                                        <parameter name="domain-A.tpn" value="1"/>
                                                                     </set>
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                                            <outcome value='tunnel-termination-point'>
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-pnf.relationship-list.relationship_length`">
+                                                                        <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">
+                                                                            <outcome value="tunnel-termination-point">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.src-ttp-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.src-ttp-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="tunnel-termination-point" 
-		key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id 
-		AND depth = '0'"
-        pfx='tmp.aai.src-ttp' local-only='false' >
-                                                                                        <outcome value='success'>
-                                                                                            <set>
-                                                                                                <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />
-                                                                                            </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id AND depth = '0'" pfx="tmp.aai.src-ttp" local-only="false">
+                                                                                        <outcome value="success">
+                                                                                            <block atomic="true">
+                                                                                                <switch test="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
+                                                                                                    <outcome value="">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="0">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="Other">
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
+                                                                                                            <switch test="`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`">
+                                                                                                                <outcome value="p-interface">
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name="domain-A.ttp-id" value="`$tmp.aai.src-ttp.tunnel-tp-id`"/>
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </for>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </block>
                                                                                         </outcome>
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value='network-resource'>
+                                                                            <outcome value="network-resource">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.domain-A.network-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="network-resource" 
-		key="network-resource.network-id = $tmp.domain-A.network-id 
-		AND depth = '0'"
-        pfx='tmp.aai.src-network-resource' local-only='false' >
-                                                                                        <outcome value='success'>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.domain-A.network-id AND depth = '0'" pfx="tmp.aai.src-network-resource" local-only="false">
+                                                                                        <outcome value="success">
                                                                                             <set>
-                                                                                                <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
-                                                                                                <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
-                                                                                                <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
-                                                                                                <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
-                                                                                                <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                <parameter name="domain-A.network-id" value="`$tmp.aai.src-network-resource.network-id`"/>
+                                                                                                <parameter name="domain-A.provider-id" value="`$tmp.aai.src-network-resource.provider-id`"/>
+                                                                                                <parameter name="domain-A.client-id" value="`$tmp.aai.src-network-resource.client-id`"/>
+                                                                                                <parameter name="domain-A.te-topo-id" value="`$tmp.aai.src-network-resource.te-topo-id`"/>
+                                                                                                <parameter name="domain-A.network-type" value="`$tmp.aai.src-network-resource.network-type`"/>
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -113,94 +122,99 @@
                                                                     </for>
                                                                 </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
                                                                 </return>
                                                             </outcome>
                                                         </get-resource>
                                                     </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
                                                     </return>
                                                 </outcome>
                                             </get-resource>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="p-interface" 
-		key="pnf.pnf-name = $tmp.src-pnf-name
-		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
-        pfx='tmp.aai.dst-tp' local-only='false' >
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $tmp.src-pnf-name AND p-interface.interface-name = $tmp.cross-link.src-ltpId" pfx="tmp.aai.dst-tp" local-only="false">
                                                 <!--AND depth = '0'"-->
-                                                <outcome value='success'>
+                                                <outcome value="success">
                                                     <block>
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="pnf.pnf-name = $tmp.dst-pnf-name"
-        pfx='tmp.aai.dst-pnf' local-only='false' >
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $tmp.dst-pnf-name" pfx="tmp.aai.dst-pnf" local-only="false">
                                                             <!--AND depth = '0'"-->
-                                                            <outcome value='success'>
+                                                            <outcome value="success">
                                                                 <block>
                                                                     <set>
-                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
-                                                                        <parameter name='domain-B.tpn' value='1' />
+                                                                        <parameter name="domain-B.node-id" value="`$tmp.aai.dst-pnf.pnf-id`"/>
+                                                                        <parameter name="domain-B.tpn" value="1"/>
                                                                     </set>
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                                            <outcome value='tunnel-termination-point'>
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-pnf.relationship-list.relationship_length`">
+                                                                        <switch test="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`">
+                                                                            <outcome value="tunnel-termination-point">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.dst-ttp-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.dst-ttp-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="tunnel-termination-point" 
-		key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id 
-		AND depth = '0'"
-        pfx='tmp.aai.dst-ttp' local-only='false' >
-                                                                                        <outcome value='success'>
-                                                                                            <set>
-                                                                                                <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />
-                                                                                            </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id AND depth = '0'" pfx="tmp.aai.dst-ttp" local-only="false">
+                                                                                        <outcome value="success">
+                                                                                            <block atomic="true">
+                                                                                                <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
+                                                                                                    <outcome value="">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="0">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="Other">
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
+                                                                                                            <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`">
+                                                                                                                <outcome value="p-interface">
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name="domain-B.ttp-id" value="`$tmp.aai.dst-ttp.tunnel-tp-id`"/>
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </for>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </block>
                                                                                         </outcome>
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value='network-resource'>
+                                                                            <outcome value="network-resource">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.domain-B.network-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="network-resource" 
-		key="network-resource.network-id = $tmp.domain-B.network-id 
-		AND depth = '0'"
-        pfx='tmp.aai.dst-network-resource' local-only='false' >
-                                                                                        <outcome value='success'>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.domain-B.network-id AND depth = '0'" pfx="tmp.aai.dst-network-resource" local-only="false">
+                                                                                        <outcome value="success">
                                                                                             <set>
-                                                                                                <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
-                                                                                                <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
-                                                                                                <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
-                                                                                                <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
-                                                                                                <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                <parameter name="domain-B.network-id" value="`$tmp.aai.dst-network-resource.network-id`"/>
+                                                                                                <parameter name="domain-B.provider-id" value="`$tmp.aai.dst-network-resource.provider-id`"/>
+                                                                                                <parameter name="domain-B.client-id" value="`$tmp.aai.dst-network-resource.client-id`"/>
+                                                                                                <parameter name="domain-B.te-topo-id" value="`$tmp.aai.dst-network-resource.te-topo-id`"/>
+                                                                                                <parameter name="domain-B.network-type" value="`$tmp.aai.dst-network-resource.network-type`"/>
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -210,35 +224,35 @@
                                                                     </for>
                                                                 </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
                                                                 </return>
                                                             </outcome>
                                                         </get-resource>
                                                     </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
                                                     </return>
                                                 </outcome>
                                             </get-resource>
@@ -246,34 +260,57 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test='`$vidx`'>
-                                    <outcome value='0'>
-                                        <set>
-                                            <parameter name='tmp.oofsolutions-first-src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                            <parameter name='tmp.oofsolutions-first-src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='`$otn-oof.solutions_length - 1`'>
-                                        <set>
-                                            <parameter name='tmp.oofsolutions-last-dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />
-                                            <parameter name='tmp.oofsolutions-last-dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />
-                                        </set>
+                                <switch test="`length($tmp.aai.cross-link.relationship-list.relationship) == 0`">
+                                    <outcome value="true"/>
+                                    <outcome value="false">
+                                        <switch test="`$vidx`">
+                                            <outcome value="0">
+                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
+                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
+                                                        <outcome value="p-interface">
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name="tmp.oofsolutions-first-src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>
+                                                                    <parameter name="tmp.oofsolutions-first-src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>
+                                                                </set>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="`$otn-oof.solutions_length - 1`">
+                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
+                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
+                                                        <outcome value="p-interface">
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name="tmp.oofsolutions-last-dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
+                                                                    <parameter name="tmp.oofsolutions-last-dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>
+                                                                </set>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                        </switch>
                                     </outcome>
                                 </switch>
                             </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                        <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                        <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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
                             </return>
                         </outcome>
                     </get-resource>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index 406f52c0..7a4eedf3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -79,75 +79,88 @@
                             <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>
                                 <outcome value='uni'>
                                     <block atomic="true">
-                                        <set>
-                                            <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->
-                                            <parameter name='tmp.tpId' value="`$tmp.aai.uni.tpId`" />
-                                        </set>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
-                                            <parameter name="regex" value="nodeId"/>
-                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
-                                            <outcome value='success'>
-                                                <set>
-                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
-                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='' />
-                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                </return>
-                                            </outcome>
-                                        </execute>
                                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'
-		AND depth = '0'"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                            <!--		resource="generic-vnf" -->
-                                            <!--		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
-                                            <!--		AND depth = '0'"-->
-                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->
+		resource="uni" 
+		key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value"
+        pfx='tmp.aai.uni' local-only='false' >
                                             <outcome value='success'>
                                                 <block>
                                                     <set>
-                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                        <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->
+                                                        <parameter name='`tmp.unis.uni[$vidx].`' value="`$tmp.aai.uni.`" />
                                                     </set>
-                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
-                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                            <outcome value='thirdparty-controller'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                            <outcome value='network-resource'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                    </set>
-                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                                    <!--<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >-->
+                                                    <!--<parameter name="original_string" value='`tmp.unis.uni[$vidx].tp-id`'/>-->
+                                                    <!--<parameter name="regex" value="nodeId"/>-->
+                                                    <!--<parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>-->
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                        <parameter name="original_string" value='`tmp.aai.uni.tp-id`'/>
+                                                        <parameter name="regex" value="nodeId"/>
+                                                        <parameter name="tmp.aai.uni.pnf-name" value=""/>
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
+                                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                            </return>
+                                                        </outcome>
+                                                    </execute>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                        <!--		resource="generic-vnf" -->
+                                                        <!--		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
+                                                        <!--		AND depth = '0'"-->
+                                                        <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                                </set>
+                                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                                                        <outcome value='thirdparty-controller'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                                </set>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='network-resource'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="network-resource" 
 		key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'
 		AND depth = '0'"
         pfx='tmp.aai.network-resource' local-only='false' >
-                                                                        <outcome value='success'>
-                                                                            <set>
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
-                                                                            </set>
+                                                                                    <outcome value='success'>
+                                                                                        <set>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
+                                                                                        </set>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                            </block>
                                                                         </outcome>
-                                                                    </get-resource>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                    </switch>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -174,17 +187,19 @@
                 <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />
                 <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />
                 <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />
-                <parameter name='tmp.unis.uni[0].access-node-id' value="" />
-                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni[0].access-node-id' value="0.190.0.1" />
+                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="1234" />
+                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="5678" />
+                <parameter name='tmp.unis.uni[0].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />
                 <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />
                 <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />
                 <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />
                 <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />
                 <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />
-                <parameter name='tmp.unis.uni[1].access-node-id' value="" />
-                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="" />
+                <parameter name='tmp.unis.uni[1].access-node-id' value="0.190.0.3" />
+                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="9123" />
+                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="4567" />
+                <parameter name='tmp.unis.uni[1].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />
                 <parameter name='tmp.unis.uni_length' value="2" />
             </set>
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
@@ -192,6 +207,76 @@
                     <set>
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />
                     </set>
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="network-resource" 
+		key="network-resource.network-id = $oof.vpn.network-id"
+        pfx='tmp.aai.network-resource' local-only='false' >
+                        <outcome value='success'>
+                            <block>
+                                <for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >
+                                    <switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>
+                                        <outcome value='esr-thirdparty-sdnc'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.id' value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-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 pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                            </return>
+                        </outcome>
+                    </get-resource>
+                    <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'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                <!--<parameter name="format" value="json"/>-->
+                                <!--<parameter name="httpMethod" value="get"/>-->
+                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                            </set>
+                        </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>
                     <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>
                     <set>
                         <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
@@ -202,68 +287,6 @@
                         <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
                         <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
                     </set>
-                    <set>
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                    </set>
-                    <switch test="`$prop.sdncRestApi.token_id`">
-                        <outcome value=''>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
-                                <parameter name="responsePrefix" value="vpn-result"/>
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                <outcome value='failure'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                    </return>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block atomic="true"></block>
-                                </outcome>
-                            </execute>
-                        </outcome>
-                        <outcome value='Other'>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
-                                <parameter name="responsePrefix" value="vpn-result"/>
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                <outcome value='failure'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                    </return>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block atomic="true"></block>
-                                </outcome>
-                            </execute>
-                        </outcome>
-                    </switch>
                 </block>
             </for>
             <return status='success'>
-- 
cgit 1.2.3-korg