Adding local-link-connectivity-list (llcl) information to match ttp and tp locally...
authorHesam Rahimi <hesam.rahimi@huawei.com>
Wed, 13 May 2020 05:07:55 +0000 (05:07 +0000)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Wed, 13 May 2020 05:07:55 +0000 (05:07 +0000)
    - This is needed for F release

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

platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml

index d87fd49..411e70d 100644 (file)
@@ -64,7 +64,8 @@
                 "e66d9ed0.3d3d8",\r
                 "f1256a59.e632c",\r
                 "1dca15d7.0a7a3a",\r
-                "1c1d34a0.adaa8b"\r
+                "1c1d34a0.adaa8b",\r
+                "4469da89.6a377c"\r
             ]\r
         ]\r
     },\r
@@ -89,8 +90,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 905.1111450195312,\r
-        "y": 221.11758422851562,\r
+        "x": 893.1111450195312,\r
+        "y": 502.1175842285156,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 676.8888549804688,\r
-        "y": 201.33981323242188,\r
+        "x": 664.8888549804688,\r
+        "y": 482.3398132324219,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "name": "set node",\r
         "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",\r
         "comments": "",\r
-        "x": 910.111083984375,\r
-        "y": 117.22871398925781,\r
+        "x": 898.111083984375,\r
+        "y": 398.2287139892578,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1001.7779541015625,\r
-        "y": 396.45097827911377,\r
+        "x": 989.7779541015625,\r
+        "y": 677.4509782791138,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1287.4444580078125,\r
-        "y": 572.1175842285156,\r
+        "x": 1297.4444580078125,\r
+        "y": 593.1175537109375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "name": "set termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 1557.111328125,\r
-        "y": 555.0065612792969,\r
+        "x": 1567.111328125,\r
+        "y": 576.0065307617188,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1551.815185546875,\r
-        "y": 742.5621032714844,\r
+        "x": 1561.815185546875,\r
+        "y": 763.5620727539062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1634.703857421875,\r
-        "y": 899.3398742675781,\r
+        "x": 1382.703857421875,\r
+        "y": 1676.33984375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "name": "set unique-ltpId",\r
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1541.000244140625,\r
-        "y": 612.1175842285156,\r
+        "x": 1551.000244140625,\r
+        "y": 633.1175537109375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 983,\r
-        "y": 433,\r
+        "x": 971,\r
+        "y": 714,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1723.499885559082,\r
-        "y": 729.7525787353516,\r
+        "x": 1733.499885559082,\r
+        "y": 750.7525482177734,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1717.1784744262695,\r
-        "y": 781.966890335083,\r
+        "x": 1727.1784744262695,\r
+        "y": 802.9668598175049,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1874.0000457763672,\r
-        "y": 729.0065097808838,\r
+        "x": 1884.0000457763672,\r
+        "y": 750.0064792633057,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1903,\r
-        "y": 783.0065002441406,\r
+        "x": 1913,\r
+        "y": 804.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "id": "7077dcc4.1aa314",\r
         "type": "save",\r
         "name": "save tunnel-termination-point",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1686,\r
-        "y": 329.0065002441406,\r
+        "x": 1627,\r
+        "y": 1055.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1349,\r
-        "y": 317.0065002441406,\r
+        "x": 1290,\r
+        "y": 1043.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
                 "458ce581.77bfe4",\r
                 "7077dcc4.1aa314",\r
                 "dad1a90d.61b018",\r
-                "7da29c03.1dbdf4"\r
+                "7da29c03.1dbdf4",\r
+                "58b65656.8480c8"\r
             ]\r
         ]\r
     },\r
         "name": "set tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",\r
         "comments": "",\r
-        "x": 1684,\r
-        "y": 237.00650024414062,\r
+        "x": 1625,\r
+        "y": 963.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "name": "set unique-ttpId",\r
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1642.888916015625,\r
-        "y": 275.1175842285156,\r
+        "x": 1583.888916015625,\r
+        "y": 1001.1175537109375,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1952,\r
-        "y": 315.0065002441406,\r
+        "x": 1893,\r
+        "y": 1041.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1945.6785888671875,\r
-        "y": 367.22081184387207,\r
+        "x": 1886.6785888671875,\r
+        "y": 1093.220781326294,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2102.500160217285,\r
-        "y": 314.26043128967285,\r
+        "x": 2043.5001602172852,\r
+        "y": 1040.2604007720947,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "id": "652a4eb1.3c9f7",\r
         "type": "update",\r
         "name": "update tunnel-termination-point",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2183,\r
-        "y": 369.0065002441406,\r
+        "x": 2124,\r
+        "y": 1095.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "name": "set local variables",\r
         "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",\r
         "comments": "",\r
-        "x": 935,\r
-        "y": 164.00650024414062,\r
+        "x": 923,\r
+        "y": 445.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 619,\r
-        "y": 327.0065002441406,\r
+        "x": 607,\r
+        "y": 608.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1635,\r
-        "y": 842.0065002441406,\r
+        "x": 1389,\r
+        "y": 1632.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<!--<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`\" />-->\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1757,\r
-        "y": 421.0065002441406,\r
+        "x": 1698,\r
+        "y": 1147.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921,\r
-        "y": 293.0065002441406,\r
+        "x": 862,\r
+        "y": 1019.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1269,\r
-        "y": 245.00650024414062,\r
+        "x": 1210,\r
+        "y": 971.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1111,\r
-        "y": 316.0065002441406,\r
+        "x": 1057,\r
+        "y": 1054.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<switch test='`$node.termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 901,\r
-        "y": 548.0065002441406,\r
+        "x": 911,\r
+        "y": 569.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1080,\r
-        "y": 500.0065002441406,\r
+        "x": 1090,\r
+        "y": 521.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1079,\r
-        "y": 602.0065002441406,\r
+        "x": 1089,\r
+        "y": 623.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1235,\r
-        "y": 500.0065002441406,\r
+        "x": 1245,\r
+        "y": 521.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 899,\r
-        "y": 337.0065002441406,\r
+        "x": 840,\r
+        "y": 1063.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1109,\r
-        "y": 179.00650024414062,\r
+        "x": 1050,\r
+        "y": 905.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1114,\r
-        "y": 254.00650024414062,\r
+        "x": 1055,\r
+        "y": 980.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1090,\r
-        "y": 548.0065002441406,\r
+        "x": 1100,\r
+        "y": 569.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "name": "unset node",\r
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",\r
         "comments": "",\r
-        "x": 907,\r
-        "y": 66.00650024414062,\r
+        "x": 895,\r
+        "y": 347.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "name": "unset termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1569,\r
-        "y": 498.0065002441406,\r
+        "x": 1579,\r
+        "y": 519.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "name": "unset tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1684,\r
-        "y": 189.00650024414062,\r
+        "x": 1625,\r
+        "y": 915.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2089,\r
-        "y": 424.0065002441406,\r
+        "x": 2030,\r
+        "y": 1150.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2086,\r
-        "y": 472.0065002441406,\r
+        "x": 2027,\r
+        "y": 1198.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"sucessfully saved ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2244,\r
-        "y": 425.0065002441406,\r
+        "x": 2185,\r
+        "y": 1151.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"failuire on saving ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2245,\r
-        "y": 473.0065002441406,\r
+        "x": 2186,\r
+        "y": 1199.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\n    <parameter name=\"encodedValue\" value='`$tp.te.inter-domain-plug-id`'/>\n    <parameter name=\"decodedValue\" value=\"tmp.decoded-plug-id\"/>\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2035,\r
-        "y": 667.0065002441406,\r
+        "x": 2045,\r
+        "y": 688.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1605,\r
-        "y": 668.0065002441406,\r
+        "x": 1615,\r
+        "y": 689.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1832,\r
-        "y": 621.0065002441406,\r
+        "x": 1842,\r
+        "y": 642.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1833,\r
-        "y": 667.0065002441406,\r
+        "x": 1843,\r
+        "y": 688.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "name": "unset tmp.decoded-plug-id",\r
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",\r
         "comments": "",\r
-        "x": 2036,\r
-        "y": 621.0065002441406,\r
+        "x": 2046,\r
+        "y": 642.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2240,\r
-        "y": 644.0065002441406,\r
+        "x": 2250,\r
+        "y": 665.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2233.6785888671875,\r
-        "y": 696.2208118438721,\r
+        "x": 2243.6785888671875,\r
+        "y": 717.220781326294,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2381,\r
-        "y": 644.0065002441406,\r
+        "x": 2391,\r
+        "y": 665.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         "name": "unset tmp.decoded-plug-id",\r
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",\r
         "comments": "",\r
-        "x": 2440,\r
-        "y": 696.0065002441406,\r
+        "x": 2450,\r
+        "y": 717.0064697265625,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
         "y": 81.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "4469da89.6a377c",\r
+        "type": "get-resource",\r
+        "name": "get-resource esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 736,\r
+        "y": 220,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "259a6f10.d859c",\r
+                "2643a1bc.bc0f46",\r
+                "7a6e0ac1.83425c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "259a6f10.d859c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 982,\r
+        "y": 180,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "83c13ac.c0250c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2643a1bc.bc0f46",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 986,\r
+        "y": 220,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "7add65bd.d43c1c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a6e0ac1.83425c",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 978,\r
+        "y": 260,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "a3451a06.01294"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7add65bd.d43c1c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1136,\r
+        "y": 220,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a3451a06.01294",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1136,\r
+        "y": 260,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "83c13ac.c0250c8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1126,\r
+        "y": 178,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "70f6d2fc.749b0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "70f6d2fc.749b0c",\r
+        "type": "save",\r
+        "name": "save network-resource relationship to esr-thirdparty-sdnc",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list' \n      key='network-resource.network-id = $tmp.network-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"esr-thirdparty-sdnc\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"esr-thirdparty-sdnc.thirdparty-sdnc-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n<!--/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1429,\r
+        "y": 179,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "58b65656.8480c8",\r
+        "type": "switchNode",\r
+        "name": "switch llcl length",\r
+        "xml": "<switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1559,\r
+        "y": 1319,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "cf6621ae.60449",\r
+                "a969fa1e.a9262",\r
+                "31cb7972.09206e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cf6621ae.60449",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1747,\r
+        "y": 1205,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "95b8f366.2c9b38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a969fa1e.a9262",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1752,\r
+        "y": 1280,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "95b8f366.2c9b38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "31cb7972.09206e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1754,\r
+        "y": 1354,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "df66f384.e71e78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "95b8f366.2c9b38",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1907,\r
+        "y": 1271,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba6a5053.fa9158",\r
+        "type": "save",\r
+        "name": "save ttp relationship to tp in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId-second`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2135,\r
+        "y": 1357,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "f20766b0.56af",\r
+        "type": "set",\r
+        "name": "set unique-ltpId second",\r
+        "xml": "<set>\n<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`\" />\n",\r
+        "comments": "",\r
+        "x": 2084,\r
+        "y": 1313,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "df66f384.e71e78",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1894,\r
+        "y": 1350,\r
+        "z": "6d6b8a1f.be1cb4",\r
+        "wires": [\r
+            [\r
+                "f20766b0.56af",\r
+                "ba6a5053.fa9158"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index a47bab0..a22a5bd 100644 (file)
         "id": "1e876a82.9683f5",\r
         "type": "set",\r
         "name": "set ttp-inter-layer-lock-id",\r
-        "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",\r
+        "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`' />\n",\r
         "comments": "",\r
         "x": 1931,\r
         "y": 459,\r
index 5a0255d..afe1fc0 100644 (file)
-<service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-network-to-aai' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-network-to-aai" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.original-network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
             <set>\r
-                <parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />\r
+                <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>\r
             </set>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \r
-     key='network-resource.network-id = $tmp.network-id' >\r
-                <parameter name='network-id' value='`$tmp.network-id`' />\r
-                <parameter name='client-id' value='`$network.client-id`' />\r
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />\r
-                <parameter name='provider-id' value='`$network.provider-id`' />\r
-                <parameter name='network-type' value='`$network.network-types`' />\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">\r
+                <parameter name="network-id" value="`$tmp.network-id`"/>\r
+                <parameter name="client-id" value="`$network.client-id`"/>\r
+                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>\r
+                <parameter name="provider-id" value="`$network.provider-id`"/>\r
+                <parameter name="network-type" value="`$network.network-types`"/>\r
             </save>\r
-            <for index='pidx' start='0' end='`$network.node_length`' >\r
+            <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">\r
+                <outcome value="success">\r
+                    <block>\r
+                        <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">\r
+                            <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc"/>\r
+                            <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`"/>\r
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id"/>\r
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`"/>\r
+                            <!--\r
+                            /aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2\r
+                            -->\r
+                        </save>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value="not-found">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>\r
+                    </return>\r
+                </outcome>\r
+                <outcome value="Other">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>\r
+                    </return>\r
+                </outcome>\r
+            </get-resource>\r
+            <for index="pidx" start="0" end="`$network.node_length`">\r
                 <set>\r
-                    <parameter name='node.' value='' />\r
+                    <parameter name="node." value=""/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='node.' value='`$network.node[$pidx].`' />\r
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
+                    <parameter name="node." value="`$network.node[$pidx].`"/>\r
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />\r
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>\r
                 </set>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \r
-      key='pnf.pnf-name = $unique-nodeId' >\r
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />\r
-                    <parameter name='pnf-id' value='`$node.node-id`' />\r
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />\r
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\r
-                    <parameter name='in-maint' value='true' />\r
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">\r
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>\r
+                    <parameter name="pnf-id" value="`$node.node-id`"/>\r
+                    <parameter name="operational-status" value="`$node.te.oper-status`"/>\r
+                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>\r
+                    <parameter name="in-maint" value="true"/>\r
                 </save>\r
-                <switch test='`$node.te.tunnel-termination-point_length`'>\r
-                    <outcome value=''>\r
-                        <block></block>\r
+                <switch test="`$node.termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='0'>\r
-                        <block></block>\r
+                    <outcome value="0">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\r
+                    <outcome value="Other">\r
+                        <for index="tidx" start="0" end="`$node.termination-point_length`">\r
                             <set>\r
-                                <parameter name='ttp.' value='' />\r
+                                <parameter name="tp." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\r
+                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />\r
+                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>\r
                             </set>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \r
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                                <parameter name='ttp-id' value='`$unique-ttpId`' />\r
-                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                                <parameter name='name' value='`$ttp.name`' />\r
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                                <parameter name='encoding' value='`$ttp.encoding`' />\r
-                                <outcome value='success'>\r
-                                    <block></block>\r
+                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">\r
+                                <outcome value="true">\r
+                                    <set>\r
+                                        <parameter name="tmp.decoded-plug-id" value=""/>\r
+                                    </set>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \r
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                                        <parameter name='ttp-id' value='`$unique-ttpId`' />\r
-                                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                                        <parameter name='name' value='`$ttp.name`' />\r
-                                        <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                                        <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                                        <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                                        <parameter name='encoding' value='`$ttp.encoding`' />\r
-                                    </update>\r
+                                <outcome value="false">\r
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">\r
+                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>\r
+                                        <outcome value="success">\r
+                                            <block/>\r
+                                        </outcome>\r
+                                        <outcome value="failure">\r
+                                            <set>\r
+                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </execute>\r
                                 </outcome>\r
-                            </save>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                                <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />\r
-                                <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->\r
-                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />\r
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />\r
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />\r
-                                <outcome value='success'>\r
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                                        <parameter name="field1" value="__TIMESTAMP__" />\r
-                                        <parameter name="field2" value="sucess executing Hesam log file" />\r
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                                        <parameter name="field4" value="`$node.termination-point_length`" />\r
-                                        <parameter name="field5" value="sucessfully saved ttp" />\r
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />\r
-                                    </record>\r
+                            </switch>\r
+                            <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">\r
+                                <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                <parameter name="in-maint" value="true"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                <!--\r
+                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
+                                -->\r
+                                <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                                        <parameter name="field1" value="__TIMESTAMP__" />\r
-                                        <parameter name="field2" value="sucess executing Hesam log file" />\r
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                                        <parameter name="field4" value="`$node.termination-point_length`" />\r
-                                        <parameter name="field5" value="failuire on saving ttp" />\r
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />\r
-                                    </record>\r
+                                <outcome value="failure">\r
+                                    <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">\r
+                                        <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                        <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                        <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                        <parameter name="in-maint" value="true"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                        <!--\r
+                                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
+                                        -->\r
+                                        <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>\r
+                                    </update>\r
                                 </outcome>\r
                             </save>\r
                         </for>\r
                     </outcome>\r
                 </switch>\r
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
-                    <parameter name="field1" value="__TIMESTAMP__" />\r
-                    <parameter name="field2" value="sucess executing Hesam log file" />\r
-                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />\r
-                    <parameter name="field4" value="`$node.termination-point_length`" />\r
-                </record>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />\r
+                <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">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>\r
                 </save>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \r
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \r
-      force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />\r
+                <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">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>\r
                 </save>\r
-                <switch test='`$node.termination-point_length`'>\r
-                    <outcome value=''>\r
-                        <block></block>\r
+                <switch test="`$node.te.tunnel-termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='0'>\r
-                        <block></block>\r
+                    <outcome value="0">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
-                        <for index='tidx' start='0' end='`$node.termination-point_length`' >\r
+                    <outcome value="Other">\r
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">\r
                             <set>\r
-                                <parameter name='tp.' value='' />\r
+                                <parameter name="ttp." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />\r
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />\r
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
                             </set>\r
-                            <switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\r
-                                <outcome value='true'>\r
-                                    <set>\r
-                                        <parameter name='tmp.decoded-plug-id' value='' />\r
-                                    </set>\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                <parameter name="name" value="`$ttp.name`"/>\r
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>\r
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                <parameter name="encoding" value="`$ttp.encoding`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
                                 </outcome>\r
-                                <outcome value='false'>\r
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\r
-                                        <parameter name="encodedValue" value='`$tp.te.inter-domain-plug-id`'/>\r
-                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>\r
-                                        <outcome value='success'>\r
-                                            <block></block>\r
-                                        </outcome>\r
-                                        <outcome value='failure'>\r
-                                            <set>\r
-                                                <parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </execute>\r
+                                <outcome value="failure">\r
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                        <parameter name="name" value="`$ttp.name`"/>\r
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>\r
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>\r
+                                    </update>\r
                                 </outcome>\r
-                            </switch>\r
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
-      key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                                <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                                <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                                <parameter name='in-maint' value="true" />\r
-                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
-                                <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\r
-                                <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\r
-                                <outcome value='success'>\r
-                                    <block></block>\r
+                            </save>\r
+                            <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">\r
+                                <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>\r
+                                <!--\r
+                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />\r
+                                -->\r
+                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
+                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>\r
+                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
+                                <outcome value="success">\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="sucessfully saved ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
+                                    </record>\r
                                 </outcome>\r
-                                <outcome value='failure'>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
-      key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                                        <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                                        <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                                        <parameter name='in-maint' value="true" />\r
-                                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
-                                        <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\r
-                                        <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\r
-                                    </update>\r
+                                <outcome value="failure">\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                                        <parameter name="field5" value="failuire on saving ttp"/>\r
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>\r
+                                    </record>\r
                                 </outcome>\r
                             </save>\r
+                            <switch test="`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`">\r
+                                <outcome value="">\r
+                                    <block/>\r
+                                </outcome>\r
+                                <outcome value="0">\r
+                                    <block/>\r
+                                </outcome>\r
+                                <outcome value="Other">\r
+                                    <block>\r
+                                        <set>\r
+                                            <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`"/>\r
+                                        </set>\r
+                                        <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">\r
+                                            <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>\r
+                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`"/>\r
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`"/>\r
+                                        </save>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
                         </for>\r
                     </outcome>\r
                 </switch>\r
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>\r
+                    <parameter name="field1" value="__TIMESTAMP__"/>\r
+                    <parameter name="field2" value="sucess executing Hesam log file"/>\r
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                    <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                </record>\r
             </for>\r
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>\r
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>\r
         </block>\r
     </method>\r
 </service-logic>
\ No newline at end of file
index 9039685..4ce3362 100644 (file)
@@ -1,99 +1,96 @@
-<service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-tp-ttp-relationship' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-tp-ttp-relationship" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-eth.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.original-network-eth.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network-otn.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.original-network-otn.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
             <set>\r
-                <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />\r
-                <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />\r
+                <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>\r
+                <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>\r
             </set>\r
-            <for index='pethidx' start='0' end='`$network-eth.node_length`' >\r
+            <for index="pethidx" start="0" end="`$network-eth.node_length`">\r
                 <set>\r
-                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />\r
+                    <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\r
+                    <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />\r
+                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>\r
                 </set>\r
-                <switch test='`$node-eth.termination-point_length`'>\r
-                    <outcome value=''>\r
-                        <block></block>\r
+                <switch test="`$node-eth.termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='0'>\r
-                        <block></block>\r
+                    <outcome value="0">\r
+                        <block/>\r
                     </outcome>\r
-                    <outcome value='Other'>\r
-                        <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\r
+                    <outcome value="Other">\r
+                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">\r
                             <set>\r
-                                <parameter name='tp-eth.' value='' />\r
+                                <parameter name="tp-eth." value=""/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\r
+                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />\r
+                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\r
+                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>\r
                             </set>\r
-                            <for index='potnidx' start='0' end='`$network-otn.node_length`' >\r
+                            <for index="potnidx" start="0" end="`$network-otn.node_length`">\r
                                 <set>\r
-                                    <parameter name='node-otn.' value='' />\r
-                                    <parameter name='unique-network-otnId' value='' />\r
-                                    <parameter name='unique-node-otnId' value="" />\r
+                                    <parameter name="node-otn." value=""/>\r
+                                    <parameter name="unique-network-otnId" value=""/>\r
+                                    <parameter name="unique-node-otnId" value=""/>\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />\r
+                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\r
+                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />\r
+                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>\r
                                 </set>\r
-                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>\r
-                                    <outcome value=''>\r
-                                        <block></block>\r
+                                <switch test="`$node-otn.te.tunnel-termination-point_length`">\r
+                                    <outcome value="">\r
+                                        <block/>\r
                                     </outcome>\r
-                                    <outcome value='0'>\r
-                                        <block></block>\r
+                                    <outcome value="0">\r
+                                        <block/>\r
                                     </outcome>\r
-                                    <outcome value='Other'>\r
-                                        <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\r
+                                    <outcome value="Other">\r
+                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">\r
                                             <set>\r
-                                                <parameter name='ttp.' value='' />\r
+                                                <parameter name="ttp." value=""/>\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\r
+                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />\r
+                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\r
+                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>\r
                                             </set>\r
-                                            <switch test='`$tp-inter-layer-lock-id`'>\r
-                                                <outcome value='`$ttp-inter-layer-lock-id`'>\r
-                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \r
-      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">\r
-                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />\r
-                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />\r
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />\r
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />\r
+                                            <switch test="`$tp-inter-layer-lock-id`">\r
+                                                <outcome value="`$ttp-inter-layer-lock-id`">\r
+                                                    <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">\r
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>\r
+                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>\r
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
                                                     </save>\r
                                                 </outcome>\r
                                             </switch>\r
index 8b19b0e..6d2bdbb 100644 (file)
         "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "84d1cb1a.eb2fc8"\r
+                "921b5877.d781b"\r
             ]\r
         ]\r
     },\r
         "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "2182e897.132d8"\r
+                "5ee72a4.dae15d4"\r
             ]\r
         ]\r
     },\r
         "id": "2182e897.132d8",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />-->\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1223,\r
         "id": "84d1cb1a.eb2fc8",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Creat OTN tunnel without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />-->\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1235,\r
         "id": "77be498b.1e80d",\r
         "type": "set",\r
         "name": "set attachment_param",\r
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />",\r
+        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\n\n<!--<set>-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->",\r
         "comments": "",\r
         "x": 1269,\r
         "y": 823,\r
         "id": "5ad550e4.a3ef2",\r
         "type": "set",\r
         "name": "set attachment_param",\r
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />",\r
+        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\n\n<!--<set>-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->",\r
         "comments": "",\r
         "x": 1669,\r
         "y": 872,\r
                 "84bd363f.cecab"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "921b5877.d781b",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />-->\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1231,\r
+        "y": 1112,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "ab8d3cb8.cfa08",\r
+                "1b911a1d.a19f46"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5ee72a4.dae15d4",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />-->\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1223,\r
+        "y": 1285,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "ab8d3cb8.cfa08",\r
+                "1b911a1d.a19f46"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index 5800585..c785b72 100644 (file)
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1389.0001220703125,\r
-        "y": 756.2864990234375,\r
+        "x": 1150.0001220703125,\r
+        "y": 1085.2864990234375,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1383.0001220703125,\r
-        "y": 806.2864990234375,\r
+        "x": 1144.0001220703125,\r
+        "y": 1135.2864990234375,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": [\r
             [\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1550.0001220703125,\r
-        "y": 745.2864990234375,\r
+        "x": 1311.0001220703125,\r
+        "y": 1074.2864990234375,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": []\r
     },\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1548.0001220703125,\r
-        "y": 801.2864990234375,\r
+        "x": 1309.0001220703125,\r
+        "y": 1130.2864990234375,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": []\r
     },\r
     {\r
         "id": "40299798.13bc",\r
         "type": "switchNode",\r
-        "name": "test cross-domain-link",\r
+        "name": "test cross-domain-link role",\r
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2198.5001220703125,\r
+        "x": 2232.5,\r
         "y": 999,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": []\r
         "wires": [\r
             [\r
                 "dd179bba.27e578",\r
-                "3a661a62.460126",\r
                 "a736e107.ab857",\r
-                "51dd454b.e64094"\r
+                "51dd454b.e64094",\r
+                "e9ba305b.3f7b08"\r
             ]\r
         ]\r
     },\r
         "name": "setup variables",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2330.5001220703125,\r
-        "y": 379,\r
+        "x": 2331.5,\r
+        "y": 182,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": []\r
     },\r
         "z": "5b68e0d.bd97b2",\r
         "wires": [\r
             [\r
-                "ebf0e7da.b09cb"\r
+                "a982c4fa.2154f"\r
             ]\r
         ]\r
     },\r
         "id": "ebf0e7da.b09cb",\r
         "type": "set",\r
         "name": "set domain A node ttp-id",\r
-        "xml": "<set>\n<parameter name='domain-A.ttp-id' value=\"`$tmp.aai.src-ttp.ttp-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='domain-A.ttp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 4671.5001220703125,\r
-        "y": 373,\r
+        "x": 6035.5,\r
+        "y": 431,\r
         "z": "5b68e0d.bd97b2",\r
         "wires": []\r
     },\r
         "z": "5b68e0d.bd97b2",\r
         "wires": [\r
             [\r
-                "5bd66639.66f16"\r
+                "fe418352.84c6"\r
             ]\r
         ]\r
     },\r
-    {\r
-        "id": "5bd66639.66f16",\r
-        "type": "set",\r
-        "name": "set domain B node ttp-id",\r
-        "xml": "<set>\n<parameter name='domain-B.ttp-id' value=\"`$tmp.aai.dst-ttp.ttp-id`\" />\n",\r
-        "comments": "",\r
-        "x": 4625.5001220703125,\r
-        "y": 739,\r
-        "z": "5b68e0d.bd97b2",\r
-        "wires": []\r
-    },\r
     {\r
         "id": "d4d32344.490fe8",\r
         "type": "set",\r
         "wires": [\r
             [\r
                 "40299798.13bc",\r
-                "c0faec82.816fb8"\r
+                "ba0dda0.572ad28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9ba305b.3f7b08",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2266,\r
+        "y": 307,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "5728cf0a.e04c88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5728cf0a.e04c88",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2465,\r
+        "y": 304,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a07b7ba1.16119"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a07b7ba1.16119",\r
+        "type": "outcome",\r
+        "name": "p-interface",\r
+        "xml": "<outcome value='p-interface'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2642.117431640625,\r
+        "y": 302.34027099609375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "5430daff.402bcc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b3de6391.5ab778",\r
+        "type": "set",\r
+        "name": "set src-ltpId and dst-ltpId",\r
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 2956,\r
+        "y": 246,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cf93cd1e.3a945",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 2917,\r
+        "y": 309,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5430daff.402bcc",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2782,\r
+        "y": 287,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "b3de6391.5ab778",\r
+                "cf93cd1e.3a945"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f1b6891b.494ac",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1342,\r
+        "y": 890,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "71c25391.1fc4f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "71c25391.1fc4f4",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1541,\r
+        "y": 887,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "fb1d0e47.e5d04"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb1d0e47.e5d04",\r
+        "type": "outcome",\r
+        "name": "p-interface",\r
+        "xml": "<outcome value='p-interface'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1718.117431640625,\r
+        "y": 885.3402709960938,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d166e350.8b25f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d166e350.8b25f",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1858,\r
+        "y": 870,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "76dcccfc.66809c",\r
+                "c46fae49.1a78a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76dcccfc.66809c",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 1993,\r
+        "y": 892,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8ebbd23d.9dd4d",\r
+        "type": "switchNode",\r
+        "name": "test $vidx",\r
+        "xml": "<switch test='`$vidx`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1793,\r
+        "y": 730,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "e155bd88.0bc8b",\r
+                "74a1badc.9d6fbc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e155bd88.0bc8b",\r
+        "type": "outcome",\r
+        "name": "outcome first",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1958,\r
+        "y": 708,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "f1b6891b.494ac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "74a1badc.9d6fbc",\r
+        "type": "outcome",\r
+        "name": "outcome last",\r
+        "xml": "<outcome value='`$otn-oof.solutions_length - 1`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1957,\r
+        "y": 769,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "bf04627d.7c822"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c46fae49.1a78a8",\r
+        "type": "set",\r
+        "name": "set oofsolutions-first info",\r
+        "xml": "<set>\n<parameter name='tmp.oofsolutions-first-src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-first-src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n\n\n\n",\r
+        "comments": "",\r
+        "x": 2041,\r
+        "y": 847,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bf04627d.7c822",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1320,\r
+        "y": 993,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "1e746899.4a1de7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e746899.4a1de7",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1519,\r
+        "y": 990,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "1fda2797.1ef958"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1fda2797.1ef958",\r
+        "type": "outcome",\r
+        "name": "p-interface",\r
+        "xml": "<outcome value='p-interface'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1696.117431640625,\r
+        "y": 988.3402709960938,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "73e8ef8a.6dee8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73e8ef8a.6dee8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1836,\r
+        "y": 973,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "9ff282e5.e46b2",\r
+                "d72292cf.36986"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ff282e5.e46b2",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 1971,\r
+        "y": 995,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d72292cf.36986",\r
+        "type": "set",\r
+        "name": "set oofsolutions last info",\r
+        "xml": "<set>\n<parameter name='tmp.oofsolutions-last-dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-last-dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 2026,\r
+        "y": 949,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ba0dda0.572ad28",\r
+        "type": "switchNode",\r
+        "name": "switch relationship_length",\r
+        "xml": "<switch test='`length($tmp.aai.cross-link.relationship-list.relationship) == 0`'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1440,\r
+        "y": 731,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d7ed588c.061ed8",\r
+                "b66c4a0f.48599"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d7ed588c.061ed8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1631,\r
+        "y": 698,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b66c4a0f.48599",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1632,\r
+        "y": 745,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "8ebbd23d.9dd4d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a982c4fa.2154f",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4642,\r
+        "y": 370,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "203d5e77.1749e2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7cb92f1c.0d62a8",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-ttp.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5223,\r
+        "y": 433,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "517c6485.d4072c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "517c6485.d4072c",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5449,\r
+        "y": 433,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "66fdc763.76b7a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66fdc763.76b7a8",\r
+        "type": "outcome",\r
+        "name": "p-interface",\r
+        "xml": "<outcome value='p-interface'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5643.2861328125,\r
+        "y": 432.82177734375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d6464d3a.f940c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d6464d3a.f940c8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5818.1171875,\r
+        "y": 432.34027099609375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ebf0e7da.b09cb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "203d5e77.1749e2",\r
+        "type": "switchNode",\r
+        "name": "switch ttp relationship",\r
+        "xml": "<switch test='`$tmp.aai.src-ttp.relationship-list.relationship_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4840,\r
+        "y": 372,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "6d19c367.9a927c",\r
+                "ad218f76.da61f",\r
+                "4692a096.2a98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6d19c367.9a927c",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5023,\r
+        "y": 334,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "13f17017.84d56"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4692a096.2a98",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5033,\r
+        "y": 382,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "13f17017.84d56"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ad218f76.da61f",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5022,\r
+        "y": 436,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "7cb92f1c.0d62a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "13f17017.84d56",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5178,\r
+        "y": 334,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fe418352.84c6",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4631,\r
+        "y": 744,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a04c015d.4f2be"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "491826fa.0106a8",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-ttp.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5212,\r
+        "y": 807,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "1943c22a.5a60a6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a04c015d.4f2be",\r
+        "type": "switchNode",\r
+        "name": "switch ttp relationship",\r
+        "xml": "<switch test='`$tmp.aai.dst-ttp.relationship-list.relationship_length`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4829,\r
+        "y": 746,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d6405c54.6f4518",\r
+                "6576831f.203ff4",\r
+                "863d1cc0.5d8dc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d6405c54.6f4518",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5012,\r
+        "y": 708,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "3eef1226.8c611e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "863d1cc0.5d8dc8",\r
+        "type": "outcome",\r
+        "name": "length 0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5022,\r
+        "y": 756,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "3eef1226.8c611e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6576831f.203ff4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5011,\r
+        "y": 810,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "491826fa.0106a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3eef1226.8c611e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5167,\r
+        "y": 708,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "66a31e69.f659b8",\r
+        "type": "set",\r
+        "name": "set domain B node ttp-id",\r
+        "xml": "<set>\n<parameter name='domain-B.ttp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n",\r
+        "comments": "",\r
+        "x": 6024.5,\r
+        "y": 805,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1943c22a.5a60a6",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5438,\r
+        "y": 807,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d1d6f06f.051f98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d1d6f06f.051f98",\r
+        "type": "outcome",\r
+        "name": "p-interface",\r
+        "xml": "<outcome value='p-interface'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5632.2861328125,\r
+        "y": 806.82177734375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "c6c9b722.1343d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c6c9b722.1343d8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5807.1171875,\r
+        "y": 806.3402709960938,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "66a31e69.f659b8"\r
             ]\r
         ]\r
     }\r
index 658a04c..6005d81 100644 (file)
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "2cd069f4.1bd85e",\r
-                "e85654b4.901fd",\r
-                "596112fe.dbc0a4"\r
+                "8a87ece8.73f728"\r
             ]\r
         ]\r
     },\r
         "id": "2cd069f4.1bd85e",\r
         "type": "set",\r
         "name": "set tmp.unis.uni[].tpId",\r
-        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='tmp.tpId' value=\"`$tmp.aai.uni.tpId`\" />\n",\r
+        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='tmp.tp-id' value=\"`$tmp.aai.uni.tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1843.117431640625,\r
-        "y": 598.3402709960938,\r
+        "x": 2557.117431640625,\r
+        "y": 641.3402709960938,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
         "id": "e85654b4.901fd",\r
         "type": "execute",\r
-        "name": "execute split tpId to get pnf-name",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`tmp.unis.uni[$vidx].tpId`'/>\n<parameter name=\"regex\" value=\"nodeId\"/>\n<parameter name=\"tmp.unis.uni[$vidx].pnf-name\" value=\"\"/>\n",\r
+        "name": "execute split tp-id to get pnf-name",\r
+        "xml": "<!--<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >-->\n<!--<parameter name=\"original_string\" value='`tmp.unis.uni[$vidx].tp-id`'/>-->\n<!--<parameter name=\"regex\" value=\"nodeId\"/>-->\n<!--<parameter name=\"tmp.unis.uni[$vidx].pnf-name\" value=\"\"/>-->\n\n<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`tmp.aai.uni.tp-id`'/>\n<parameter name=\"regex\" value=\"nodeId\"/>\n<parameter name=\"tmp.aai.uni.pnf-name\" value=\"\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1882,\r
-        "y": 673,\r
+        "x": 2596,\r
+        "y": 716,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2105,\r
-        "y": 628,\r
+        "x": 2819,\r
+        "y": 671,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2107,\r
-        "y": 692,\r
+        "x": 2821,\r
+        "y": 735,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 2327,\r
-        "y": 630,\r
+        "x": 3041,\r
+        "y": 673,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 2266,\r
-        "y": 711,\r
+        "x": 2980,\r
+        "y": 754,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\t\tresource=\"generic-vnf\" -->\n<!--\t\tkey=\"'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n<!--\t\tAND depth = '0'\"-->\n<!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1812,\r
-        "y": 810,\r
+        "x": 2526,\r
+        "y": 853,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2171.88232421875,\r
-        "y": 818.6556396484375,\r
+        "x": 2885.88232421875,\r
+        "y": 861.6556396484375,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "name": "set node-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].node-id`' value=\"`$tmp.aai.pnf.pnf-id`\" />\n",\r
         "comments": "",\r
-        "x": 2351,\r
-        "y": 772,\r
+        "x": 3065,\r
+        "y": 815,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
         "xml": "<for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2363.882568359375,\r
-        "y": 858.6597290039062,\r
+        "x": 3077.882568359375,\r
+        "y": 901.6597290039062,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2589.882568359375,\r
-        "y": 858.6597290039062,\r
+        "x": 3303.882568359375,\r
+        "y": 901.6597290039062,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2788,\r
+        "x": 3513,\r
         "y": 971,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3001,\r
+        "x": 3726,\r
         "y": 972,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "name": "set network-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].network-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3236,\r
+        "x": 3961,\r
         "y": 902,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3244,\r
+        "x": 3969,\r
         "y": 983,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3476.5,\r
+        "x": 4201.5,\r
         "y": 979,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "name": "set network-id, topo-id, client-id, etc",\r
         "xml": "<set>\n<parameter name=\"`$tmp.unis.uni[$vidx].network-id`\" value=\"`$tmp.aai.network-resource.network-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].provider-id`\" value=\"`$tmp.aai.network-resource.provider-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].client-id`\" value=\"`$tmp.aai.network-resource.client-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].te-topo-id`\" value=\"`$tmp.aai.network-resource.te-topo-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].network-type`\" value=\"`$tmp.aai.network-resource.network-type`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 3745,\r
+        "x": 4470,\r
         "y": 978,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
         "xml": "<outcome value='thirdparty-controller'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2815,\r
+        "x": 3540,\r
         "y": 836,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3028,\r
+        "x": 3753,\r
         "y": 837,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
         "name": "set thirdparty-sdnc-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3255,\r
+        "x": 3980,\r
         "y": 836,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
         "name": "set oof.vpn",\r
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",\r
         "comments": "",\r
-        "x": 1092.0272216796875,\r
-        "y": 1027.040771484375,\r
+        "x": 1096.0272216796875,\r
+        "y": 946.040771484375,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
         "id": "a9643f3f.4f04b",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1156.0272216796875,\r
         "wires": [\r
             [\r
                 "124c6957.e07dc7",\r
-                "3ce3b19a.7c10c6",\r
-                "d661efba.3fa238",\r
-                "ee991e0.ab6b36",\r
-                "f7756434.d014e"\r
+                "f7756434.d014e",\r
+                "a9643f3f.4f04b",\r
+                "ae925256.a68df",\r
+                "ee991e0.ab6b36"\r
             ]\r
         ]\r
     },\r
         "id": "678c3911.078e2",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Create ethernet Service with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1660.52734375,\r
         "id": "42cb8b06.e7daec",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1670.52734375,\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1995,\r
-        "y": 817,\r
+        "x": 2709,\r
+        "y": 860,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
         "id": "672fc75a.1e91b",\r
         "type": "set",\r
         "name": "set tmp.unis.uni[].tpId",\r
-        "xml": "<set>\n<parameter name='tmp.unis.uni[0].id' value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />\n<parameter name='tmp.unis.uni[0].tp-id' value=\"networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].access-provider-id' value=\"`$domain-A.provider-id`\" />\n<parameter name='tmp.unis.uni[0].access-client-id' value=\"`$domain-A.client-id`\" />\n<parameter name='tmp.unis.uni[0].access-topology-id' value=\"`$domain-A.topology-id`\" />\n<parameter name='tmp.unis.uni[0].access-node-id' value=\"\" />\n<parameter name='tmp.unis.uni[0].src-access-ltp-id' value=\"\" />\n<parameter name='tmp.unis.uni[0].dst-access-ltp-id' value=\"\" />\n\n<parameter name='tmp.unis.uni[1].id' value=\"5642e9dd-496c-4ef6-be97-5caf4e9beec9\" />\n<parameter name='tmp.unis.uni[1].tp-id' value=\"networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4\" />\n<parameter name='tmp.unis.uni[1].access-provider-id' value=\"`$domain-B.provider-id`\" />\n<parameter name='tmp.unis.uni[1].access-client-id' value=\"`$domain-B.client-id`\" />\n<parameter name='tmp.unis.uni[1].access-topology-id' value=\"`$domain-B.topology-id`\" />\n<parameter name='tmp.unis.uni[1].access-node-id' value=\"\" />\n<parameter name='tmp.unis.uni[1].src-access-ltp-id' value=\"\" />\n<parameter name='tmp.unis.uni[1].dst-access-ltp-id' value=\"\" />\n\n<parameter name='tmp.unis.uni_length' value=\"2\" />\n\n",\r
+        "xml": "<set>\n<parameter name='tmp.unis.uni[0].id' value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />\n<parameter name='tmp.unis.uni[0].tp-id' value=\"networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].access-provider-id' value=\"`$domain-A.provider-id`\" />\n<parameter name='tmp.unis.uni[0].access-client-id' value=\"`$domain-A.client-id`\" />\n<parameter name='tmp.unis.uni[0].access-topology-id' value=\"`$domain-A.topology-id`\" />\n<parameter name='tmp.unis.uni[0].access-node-id' value=\"0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].src-access-ltp-id' value=\"1234\" />\n<parameter name='tmp.unis.uni[0].dst-access-ltp-id' value=\"5678\" />\n<parameter name='tmp.unis.uni[0].network-id' value=\"domain2-providerId-5555-clientId-6666-topologyId-11\" />\n\n\n<parameter name='tmp.unis.uni[1].id' value=\"5642e9dd-496c-4ef6-be97-5caf4e9beec9\" />\n<parameter name='tmp.unis.uni[1].tp-id' value=\"networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4\" />\n<parameter name='tmp.unis.uni[1].access-provider-id' value=\"`$domain-B.provider-id`\" />\n<parameter name='tmp.unis.uni[1].access-client-id' value=\"`$domain-B.client-id`\" />\n<parameter name='tmp.unis.uni[1].access-topology-id' value=\"`$domain-B.topology-id`\" />\n<parameter name='tmp.unis.uni[1].access-node-id' value=\"0.190.0.3\" />\n<parameter name='tmp.unis.uni[1].src-access-ltp-id' value=\"9123\" />\n<parameter name='tmp.unis.uni[1].dst-access-ltp-id' value=\"4567\" />\n<parameter name='tmp.unis.uni[1].network-id' value=\"domain2-providerId-5555-clientId-6666-topologyId-11\" />\n\n\n<parameter name='tmp.unis.uni_length' value=\"2\" />\n\n",\r
         "comments": "",\r
         "x": 655,\r
         "y": 1015,\r
         "z": "9b26c8a0.a64c1",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "ae925256.a68df",\r
+        "type": "get-resource",\r
+        "name": "get network-resource",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $oof.vpn.network-id\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1128,\r
+        "y": 1024,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "23c084ce.22a7f4",\r
+                "d2d56dd3.d8df6",\r
+                "28e7be58.d60b6a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "23c084ce.22a7f4",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1323.5001220703125,\r
+        "y": 981,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "16ae77fe.3db2f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d2d56dd3.d8df6",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315.5001220703125,\r
+        "y": 1036,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "8f6658aa.e556f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "28e7be58.d60b6a",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1320.5001220703125,\r
+        "y": 1093,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "5bc0d431.a1baf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5bc0d431.a1baf4",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1472.5001220703125,\r
+        "y": 1094,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8f6658aa.e556f8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1483.5001220703125,\r
+        "y": 1039,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "16ae77fe.3db2f",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1467.8824462890625,\r
+        "y": 978.6556701660156,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "1facb6e4.b004d9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1facb6e4.b004d9",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1682.8826904296875,\r
+        "y": 978.6597290039062,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "a5fdb89.17d6dc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5fdb89.17d6dc8",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1908.8826904296875,\r
+        "y": 978.6597290039062,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "d4a46397.2bb99"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4a46397.2bb99",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2115.0001220703125,\r
+        "y": 977,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "d4ec153c.0cdc78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4ec153c.0cdc78",\r
+        "type": "set",\r
+        "name": "set prop.sdncRestApi.thirdpartySdnc.id",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value=\"`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 2133,\r
+        "y": 1056,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8a87ece8.73f728",\r
+        "type": "get-resource",\r
+        "name": "get-resource uni",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"uni\" \n\t\tkey=\"uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value\"\n        pfx='tmp.aai.uni' local-only='false' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1802,\r
+        "y": 689,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "af655688.304b78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "af655688.304b78",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1974,\r
+        "y": 689,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "91d7b892.85ea"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc6860a4.74042",\r
+        "type": "set",\r
+        "name": "set tmp.unis.uni[]",\r
+        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='`tmp.unis.uni[$vidx].`' value=\"`$tmp.aai.uni.`\" />\n",\r
+        "comments": "",\r
+        "x": 2299,\r
+        "y": 645,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "91d7b892.85ea",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2115,\r
+        "y": 691,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": [\r
+            [\r
+                "bc6860a4.74042",\r
+                "e85654b4.901fd",\r
+                "596112fe.dbc0a4"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index c6505ad..96f3843 100644 (file)
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\r
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\r
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\r
+                            <!--<set>-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->\r
                         </set>\r
                     </block>\r
                 </outcome>\r
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\r
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\r
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\r
+                                    <!--<set>-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->\r
                                 </set>\r
                             </block>\r
                         </outcome>\r
             </execute>\r
             <switch test="`$prop.sdncRestApi.token_id`">\r
                 <outcome value=''>\r
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />\r
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />\r
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                         <parameter name="format" value="json"/>\r
                         <parameter name="httpMethod" value="patch"/>\r
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->\r
                         <parameter name="responsePrefix" value="vpn-result"/>\r
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                         <parameter name="trustStorePassword" value="adminadmin"/>\r
                     </execute>\r
                 </outcome>\r
                 <outcome value='Other'>\r
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />\r
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />\r
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                         <parameter name="format" value="json"/>\r
                         <parameter name="httpMethod" value="patch"/>\r
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->\r
                         <parameter name="responsePrefix" value="vpn-result"/>\r
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                         <parameter name="trustStorePassword" value="adminadmin"/>\r
index 7159b23..3ea459a 100644 (file)
@@ -1,13 +1,11 @@
-<service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
-    <method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">\r
+    <method rpc="sotn-get-otn-tunnel-path-from-oof" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />\r
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />\r
-                <parameter name="restapiUser" value="`$prop.oof.user`" />\r
-                <parameter name="restapiPassword" value="`$prop.oof.password`" />\r
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`"/>\r
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`"/>\r
+                <parameter name="restapiUser" value="`$prop.oof.user`"/>\r
+                <parameter name="restapiPassword" value="`$prop.oof.password`"/>\r
                 <parameter name="format" value="json"/>\r
                 <parameter name="httpMethod" value="post"/>\r
                 <parameter name="responsePrefix" value="otn-oof"/>\r
                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error executing OOF api" />\r
+                <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>\r
+                <outcome value="failure">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="Error executing OOF api"/>\r
                     </return>\r
                 </outcome>\r
-                <outcome value='success'>\r
-                    <block></block>\r
+                <outcome value="success">\r
+                    <block/>\r
                 </outcome>\r
             </execute>\r
-            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >\r
+            <for index="vidx" start="0" end="`$otn-oof.solutions_length`">\r
                 <block atomic="true">\r
                     <set>\r
-                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />\r
+                        <parameter name="otn-oof.link-name" value="`$otn-oof.solutions[$vidx].link`"/>\r
                     </set>\r
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="logical-link" \r
-               key="logical-link.link-name = $otn-oof.link-name"\r
-        pfx='tmp.aai.cross-link' local-only='false' >\r
+                    <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">\r
                         <!--AND depth = '0'"-->\r
-                        <outcome value='success'>\r
+                        <outcome value="success">\r
                             <block>\r
-                                <switch test='`$tmp.aai.cross-link.link-role`'>\r
-                                    <outcome value='cross-domain'>\r
+                                <switch test="`$tmp.aai.cross-link.link-role`">\r
+                                    <outcome value="cross-domain">\r
                                         <block atomic="true">\r
-                                            <set>\r
-                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />\r
-                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />\r
-                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />\r
-                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />\r
-                                            </set>\r
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="p-interface" \r
-               key="pnf.pnf-name = $tmp.src-pnf-name\r
-                   AND p-interface.interface-name = $tmp.cross-link.src-ltpId"\r
-        pfx='tmp.aai.src-tp' local-only='false' >\r
+                                            <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">\r
+                                                <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">\r
+                                                    <outcome value="p-interface">\r
+                                                        <block>\r
+                                                            <set>\r
+                                                                <parameter name="tmp.cross-link.src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>\r
+                                                                <parameter name="tmp.cross-link.dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>\r
+                                                                <parameter name="tmp.src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>\r
+                                                                <parameter name="tmp.dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>\r
+                                                            </set>\r
+                                                            <break/>\r
+                                                        </block>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </for>\r
+                                            <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">\r
                                                 <!--AND depth = '0'"-->\r
-                                                <outcome value='success'>\r
+                                                <outcome value="success">\r
                                                     <block>\r
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="pnf.pnf-name = $tmp.src-pnf-name"\r
-        pfx='tmp.aai.src-pnf' local-only='false' >\r
+                                                        <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">\r
                                                             <!--AND depth = '0'"-->\r
-                                                            <outcome value='success'>\r
+                                                            <outcome value="success">\r
                                                                 <block>\r
                                                                     <set>\r
-                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />\r
-                                                                        <parameter name='domain-A.tpn' value='1' />\r
+                                                                        <parameter name="domain-A.node-id" value="`$tmp.aai.src-pnf.pnf-id`"/>\r
+                                                                        <parameter name="domain-A.tpn" value="1"/>\r
                                                                     </set>\r
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\r
-                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                                            <outcome value='tunnel-termination-point'>\r
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-pnf.relationship-list.relationship_length`">\r
+                                                                        <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">\r
+                                                                            <outcome value="tunnel-termination-point">\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='tmp.src-ttp-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                                                                        <parameter name="tmp.src-ttp-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>\r
                                                                                     </set>\r
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="tunnel-termination-point" \r
-               key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id \r
-               AND depth = '0'"\r
-        pfx='tmp.aai.src-ttp' local-only='false' >\r
-                                                                                        <outcome value='success'>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />\r
-                                                                                            </set>\r
+                                                                                    <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">\r
+                                                                                        <outcome value="success">\r
+                                                                                            <block atomic="true">\r
+                                                                                                <switch test="`$tmp.aai.src-ttp.relationship-list.relationship_length`">\r
+                                                                                                    <outcome value="">\r
+                                                                                                        <block/>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value="0">\r
+                                                                                                        <block/>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value="Other">\r
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-ttp.relationship-list.relationship_length`">\r
+                                                                                                            <switch test="`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`">\r
+                                                                                                                <outcome value="p-interface">\r
+                                                                                                                    <block atomic="true">\r
+                                                                                                                        <set>\r
+                                                                                                                            <parameter name="domain-A.ttp-id" value="`$tmp.aai.src-ttp.tunnel-tp-id`"/>\r
+                                                                                                                        </set>\r
+                                                                                                                    </block>\r
+                                                                                                                </outcome>\r
+                                                                                                            </switch>\r
+                                                                                                        </for>\r
+                                                                                                    </outcome>\r
+                                                                                                </switch>\r
+                                                                                            </block>\r
                                                                                         </outcome>\r
                                                                                     </get-resource>\r
                                                                                 </block>\r
                                                                             </outcome>\r
-                                                                            <outcome value='network-resource'>\r
+                                                                            <outcome value="network-resource">\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                                                                        <parameter name="tmp.domain-A.network-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>\r
                                                                                     </set>\r
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="network-resource" \r
-               key="network-resource.network-id = $tmp.domain-A.network-id \r
-               AND depth = '0'"\r
-        pfx='tmp.aai.src-network-resource' local-only='false' >\r
-                                                                                        <outcome value='success'>\r
+                                                                                    <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">\r
+                                                                                        <outcome value="success">\r
                                                                                             <set>\r
-                                                                                                <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />\r
-                                                                                                <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />\r
-                                                                                                <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />\r
-                                                                                                <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />\r
-                                                                                                <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />\r
+                                                                                                <parameter name="domain-A.network-id" value="`$tmp.aai.src-network-resource.network-id`"/>\r
+                                                                                                <parameter name="domain-A.provider-id" value="`$tmp.aai.src-network-resource.provider-id`"/>\r
+                                                                                                <parameter name="domain-A.client-id" value="`$tmp.aai.src-network-resource.client-id`"/>\r
+                                                                                                <parameter name="domain-A.te-topo-id" value="`$tmp.aai.src-network-resource.te-topo-id`"/>\r
+                                                                                                <parameter name="domain-A.network-type" value="`$tmp.aai.src-network-resource.network-type`"/>\r
                                                                                             </set>\r
                                                                                         </outcome>\r
                                                                                     </get-resource>\r
                                                                     </for>\r
                                                                 </block>\r
                                                             </outcome>\r
-                                                            <outcome value='not-found'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                            <outcome value="not-found">\r
+                                                                <return status="failure">\r
+                                                                    <parameter name="ack-final" value="Y"/>\r
+                                                                    <parameter name="error-code" value="500"/>\r
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                                 </return>\r
                                                             </outcome>\r
-                                                            <outcome value='Other'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                            <outcome value="Other">\r
+                                                                <return status="failure">\r
+                                                                    <parameter name="ack-final" value="Y"/>\r
+                                                                    <parameter name="error-code" value="500"/>\r
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                                 </return>\r
                                                             </outcome>\r
                                                         </get-resource>\r
                                                     </block>\r
                                                 </outcome>\r
-                                                <outcome value='not-found'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                <outcome value="not-found">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='Other'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                <outcome value="Other">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="p-interface" \r
-               key="pnf.pnf-name = $tmp.src-pnf-name\r
-                   AND p-interface.interface-name = $tmp.cross-link.src-ltpId"\r
-        pfx='tmp.aai.dst-tp' local-only='false' >\r
+                                            <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">\r
                                                 <!--AND depth = '0'"-->\r
-                                                <outcome value='success'>\r
+                                                <outcome value="success">\r
                                                     <block>\r
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="pnf.pnf-name = $tmp.dst-pnf-name"\r
-        pfx='tmp.aai.dst-pnf' local-only='false' >\r
+                                                        <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">\r
                                                             <!--AND depth = '0'"-->\r
-                                                            <outcome value='success'>\r
+                                                            <outcome value="success">\r
                                                                 <block>\r
                                                                     <set>\r
-                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />\r
-                                                                        <parameter name='domain-B.tpn' value='1' />\r
+                                                                        <parameter name="domain-B.node-id" value="`$tmp.aai.dst-pnf.pnf-id`"/>\r
+                                                                        <parameter name="domain-B.tpn" value="1"/>\r
                                                                     </set>\r
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\r
-                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                                            <outcome value='tunnel-termination-point'>\r
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-pnf.relationship-list.relationship_length`">\r
+                                                                        <switch test="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`">\r
+                                                                            <outcome value="tunnel-termination-point">\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='tmp.dst-ttp-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                                                                        <parameter name="tmp.dst-ttp-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>\r
                                                                                     </set>\r
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="tunnel-termination-point" \r
-               key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id \r
-               AND depth = '0'"\r
-        pfx='tmp.aai.dst-ttp' local-only='false' >\r
-                                                                                        <outcome value='success'>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />\r
-                                                                                            </set>\r
+                                                                                    <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">\r
+                                                                                        <outcome value="success">\r
+                                                                                            <block atomic="true">\r
+                                                                                                <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">\r
+                                                                                                    <outcome value="">\r
+                                                                                                        <block/>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value="0">\r
+                                                                                                        <block/>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value="Other">\r
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">\r
+                                                                                                            <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`">\r
+                                                                                                                <outcome value="p-interface">\r
+                                                                                                                    <block atomic="true">\r
+                                                                                                                        <set>\r
+                                                                                                                            <parameter name="domain-B.ttp-id" value="`$tmp.aai.dst-ttp.tunnel-tp-id`"/>\r
+                                                                                                                        </set>\r
+                                                                                                                    </block>\r
+                                                                                                                </outcome>\r
+                                                                                                            </switch>\r
+                                                                                                        </for>\r
+                                                                                                    </outcome>\r
+                                                                                                </switch>\r
+                                                                                            </block>\r
                                                                                         </outcome>\r
                                                                                     </get-resource>\r
                                                                                 </block>\r
                                                                             </outcome>\r
-                                                                            <outcome value='network-resource'>\r
+                                                                            <outcome value="network-resource">\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                                                                        <parameter name="tmp.domain-B.network-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>\r
                                                                                     </set>\r
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="network-resource" \r
-               key="network-resource.network-id = $tmp.domain-B.network-id \r
-               AND depth = '0'"\r
-        pfx='tmp.aai.dst-network-resource' local-only='false' >\r
-                                                                                        <outcome value='success'>\r
+                                                                                    <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">\r
+                                                                                        <outcome value="success">\r
                                                                                             <set>\r
-                                                                                                <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />\r
-                                                                                                <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />\r
-                                                                                                <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />\r
-                                                                                                <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />\r
-                                                                                                <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />\r
+                                                                                                <parameter name="domain-B.network-id" value="`$tmp.aai.dst-network-resource.network-id`"/>\r
+                                                                                                <parameter name="domain-B.provider-id" value="`$tmp.aai.dst-network-resource.provider-id`"/>\r
+                                                                                                <parameter name="domain-B.client-id" value="`$tmp.aai.dst-network-resource.client-id`"/>\r
+                                                                                                <parameter name="domain-B.te-topo-id" value="`$tmp.aai.dst-network-resource.te-topo-id`"/>\r
+                                                                                                <parameter name="domain-B.network-type" value="`$tmp.aai.dst-network-resource.network-type`"/>\r
                                                                                             </set>\r
                                                                                         </outcome>\r
                                                                                     </get-resource>\r
                                                                     </for>\r
                                                                 </block>\r
                                                             </outcome>\r
-                                                            <outcome value='not-found'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                            <outcome value="not-found">\r
+                                                                <return status="failure">\r
+                                                                    <parameter name="ack-final" value="Y"/>\r
+                                                                    <parameter name="error-code" value="500"/>\r
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                                 </return>\r
                                                             </outcome>\r
-                                                            <outcome value='Other'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                            <outcome value="Other">\r
+                                                                <return status="failure">\r
+                                                                    <parameter name="ack-final" value="Y"/>\r
+                                                                    <parameter name="error-code" value="500"/>\r
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                                 </return>\r
                                                             </outcome>\r
                                                         </get-resource>\r
                                                     </block>\r
                                                 </outcome>\r
-                                                <outcome value='not-found'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                <outcome value="not-found">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value='Other'>\r
-                                                    <return status='failure'>\r
-                                                        <parameter name='ack-final' value='Y'/>\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                <outcome value="Other">\r
+                                                    <return status="failure">\r
+                                                        <parameter name="ack-final" value="Y"/>\r
+                                                        <parameter name="error-code" value="500"/>\r
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <switch test='`$vidx`'>\r
-                                    <outcome value='0'>\r
-                                        <set>\r
-                                            <parameter name='tmp.oofsolutions-first-src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />\r
-                                            <parameter name='tmp.oofsolutions-first-src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />\r
-                                        </set>\r
-                                    </outcome>\r
-                                    <outcome value='`$otn-oof.solutions_length - 1`'>\r
-                                        <set>\r
-                                            <parameter name='tmp.oofsolutions-last-dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />\r
-                                            <parameter name='tmp.oofsolutions-last-dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />\r
-                                        </set>\r
+                                <switch test="`length($tmp.aai.cross-link.relationship-list.relationship) == 0`">\r
+                                    <outcome value="true"/>\r
+                                    <outcome value="false">\r
+                                        <switch test="`$vidx`">\r
+                                            <outcome value="0">\r
+                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">\r
+                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">\r
+                                                        <outcome value="p-interface">\r
+                                                            <block>\r
+                                                                <set>\r
+                                                                    <parameter name="tmp.oofsolutions-first-src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>\r
+                                                                    <parameter name="tmp.oofsolutions-first-src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>\r
+                                                                </set>\r
+                                                                <break/>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                </for>\r
+                                            </outcome>\r
+                                            <outcome value="`$otn-oof.solutions_length - 1`">\r
+                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">\r
+                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">\r
+                                                        <outcome value="p-interface">\r
+                                                            <block>\r
+                                                                <set>\r
+                                                                    <parameter name="tmp.oofsolutions-last-dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>\r
+                                                                    <parameter name="tmp.oofsolutions-last-dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>\r
+                                                                </set>\r
+                                                                <break/>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                </for>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                         </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                        <outcome value="not-found">\r
+                            <return status="failure">\r
+                                <parameter name="ack-final" value="Y"/>\r
+                                <parameter name="error-code" value="500"/>\r
+                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                             </return>\r
                         </outcome>\r
-                        <outcome value='Other'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                        <outcome value="Other">\r
+                            <return status="failure">\r
+                                <parameter name="ack-final" value="Y"/>\r
+                                <parameter name="error-code" value="500"/>\r
+                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                             </return>\r
                         </outcome>\r
                     </get-resource>\r
index 406f52c..7a4eedf 100644 (file)
                             <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>\r
                                 <outcome value='uni'>\r
                                     <block atomic="true">\r
-                                        <set>\r
-                                            <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->\r
-                                            <parameter name='tmp.tpId' value="`$tmp.aai.uni.tpId`" />\r
-                                        </set>\r
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
-                                            <parameter name="regex" value="nodeId"/>\r
-                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>\r
-                                            <outcome value='success'>\r
-                                                <set>\r
-                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                                                </set>\r
-                                            </outcome>\r
-                                            <outcome value='failure'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='' />\r
-                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                                                </return>\r
-                                            </outcome>\r
-                                        </execute>\r
                                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\r
-               AND depth = '0'"\r
-        pfx='tmp.aai.pnf' local-only='false' >\r
-                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
-                                            <!--               resource="generic-vnf" -->\r
-                                            <!--               key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
-                                            <!--               AND depth = '0'"-->\r
-                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->\r
+               resource="uni" \r
+               key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value"\r
+        pfx='tmp.aai.uni' local-only='false' >\r
                                             <outcome value='success'>\r
                                                 <block>\r
                                                     <set>\r
-                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                        <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->\r
+                                                        <parameter name='`tmp.unis.uni[$vidx].`' value="`$tmp.aai.uni.`" />\r
                                                     </set>\r
-                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
-                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                            <outcome value='thirdparty-controller'>\r
-                                                                <block atomic="true">\r
-                                                                    <set>\r
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                    </set>\r
-                                                                </block>\r
-                                                            </outcome>\r
-                                                            <outcome value='network-resource'>\r
-                                                                <block atomic="true">\r
-                                                                    <set>\r
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                    </set>\r
-                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                                    <!--<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >-->\r
+                                                    <!--<parameter name="original_string" value='`tmp.unis.uni[$vidx].tp-id`'/>-->\r
+                                                    <!--<parameter name="regex" value="nodeId"/>-->\r
+                                                    <!--<parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>-->\r
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                                        <parameter name="original_string" value='`tmp.aai.uni.tp-id`'/>\r
+                                                        <parameter name="regex" value="nodeId"/>\r
+                                                        <parameter name="tmp.aai.uni.pnf-name" value=""/>\r
+                                                        <outcome value='success'>\r
+                                                            <set>\r
+                                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                        <outcome value='failure'>\r
+                                                            <return status='failure'>\r
+                                                                <parameter name='error-code' value='' />\r
+                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                                                            </return>\r
+                                                        </outcome>\r
+                                                    </execute>\r
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="pnf" \r
+               key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\r
+               AND depth = '0'"\r
+        pfx='tmp.aai.pnf' local-only='false' >\r
+                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
+                                                        <!--           resource="generic-vnf" -->\r
+                                                        <!--           key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
+                                                        <!--           AND depth = '0'"-->\r
+                                                        <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->\r
+                                                        <outcome value='success'>\r
+                                                            <block>\r
+                                                                <set>\r
+                                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                                </set>\r
+                                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
+                                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                                                                        <outcome value='thirdparty-controller'>\r
+                                                                            <block atomic="true">\r
+                                                                                <set>\r
+                                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                                </set>\r
+                                                                            </block>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='network-resource'>\r
+                                                                            <block atomic="true">\r
+                                                                                <set>\r
+                                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                                </set>\r
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="network-resource" \r
                key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\r
                AND depth = '0'"\r
         pfx='tmp.aai.network-resource' local-only='false' >\r
-                                                                        <outcome value='success'>\r
-                                                                            <set>\r
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
-                                                                            </set>\r
+                                                                                    <outcome value='success'>\r
+                                                                                        <set>\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
+                                                                                        </set>\r
+                                                                                    </outcome>\r
+                                                                                </get-resource>\r
+                                                                            </block>\r
                                                                         </outcome>\r
-                                                                    </get-resource>\r
-                                                                </block>\r
-                                                            </outcome>\r
-                                                        </switch>\r
-                                                    </for>\r
+                                                                    </switch>\r
+                                                                </for>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </get-resource>\r
                                                 </block>\r
                                             </outcome>\r
                                         </get-resource>\r
                 <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />\r
                 <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />\r
                 <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />\r
-                <parameter name='tmp.unis.uni[0].access-node-id' value="" />\r
-                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="" />\r
-                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni[0].access-node-id' value="0.190.0.1" />\r
+                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="1234" />\r
+                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="5678" />\r
+                <parameter name='tmp.unis.uni[0].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />\r
                 <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />\r
                 <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />\r
                 <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />\r
                 <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />\r
                 <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />\r
-                <parameter name='tmp.unis.uni[1].access-node-id' value="" />\r
-                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="" />\r
-                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="" />\r
+                <parameter name='tmp.unis.uni[1].access-node-id' value="0.190.0.3" />\r
+                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="9123" />\r
+                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="4567" />\r
+                <parameter name='tmp.unis.uni[1].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />\r
                 <parameter name='tmp.unis.uni_length' value="2" />\r
             </set>\r
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r
                     <set>\r
                         <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />\r
                     </set>\r
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="network-resource" \r
+               key="network-resource.network-id = $oof.vpn.network-id"\r
+        pfx='tmp.aai.network-resource' local-only='false' >\r
+                        <outcome value='success'>\r
+                            <block>\r
+                                <for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >\r
+                                    <switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>\r
+                                        <outcome value='esr-thirdparty-sdnc'>\r
+                                            <set>\r
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.id' value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </for>\r
+                            </block>\r
+                        </outcome>\r
+                        <outcome value='not-found'>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                            </return>\r
+                        </outcome>\r
+                        <outcome value='Other'>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                            </return>\r
+                        </outcome>\r
+                    </get-resource>\r
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="esr-thirdparty-sdnc" \r
+               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \r
+                    depth = '1'"\r
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
+                        <outcome value='success'>\r
+                            <set>\r
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                <!--<parameter name="format" value="json"/>-->\r
+                                <!--<parameter name="httpMethod" value="get"/>-->\r
+                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                            </set>\r
+                        </outcome>\r
+                        <outcome value='not-found'>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
+                            </return>\r
+                        </outcome>\r
+                        <outcome value='Other'>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
+                            </return>\r
+                        </outcome>\r
+                    </get-resource>\r
                     <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>\r
                     <set>\r
                         <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' />\r
                         <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\r
                         <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' />\r
                     </set>\r
-                    <set>\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\r
-                        <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`' />\r
-                        <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`' />\r
-                        <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`' />\r
-                        <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`' />\r
-                    </set>\r
-                    <switch test="`$prop.sdncRestApi.token_id`">\r
-                        <outcome value=''>\r
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                <parameter name="format" value="json"/>\r
-                                <parameter name="httpMethod" value="patch"/>\r
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
-                                <parameter name="responsePrefix" value="vpn-result"/>\r
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                <outcome value='failure'>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="Error executing Create vpn rest api" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='success'>\r
-                                    <block atomic="true"></block>\r
-                                </outcome>\r
-                            </execute>\r
-                        </outcome>\r
-                        <outcome value='Other'>\r
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                <parameter name="format" value="json"/>\r
-                                <parameter name="httpMethod" value="patch"/>\r
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
-                                <parameter name="responsePrefix" value="vpn-result"/>\r
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                <outcome value='failure'>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="Error executing Create vpn rest api" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='success'>\r
-                                    <block atomic="true"></block>\r
-                                </outcome>\r
-                            </execute>\r
-                        </outcome>\r
-                    </switch>\r
                 </block>\r
             </for>\r
             <return status='success'>\r