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

- This is needed for F release

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

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
index 236bc6a..0d6a278 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "eb6ce69b.3f957",\r
+        "id": "ebe56983.0d3a9",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 248,\r
-        "y": 67,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 134,\r
+        "y": 65,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "dc110d5e.a3e278"\r
+                "13e5c84a.55bf3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc110d5e.a3e278",\r
+        "id": "13e5c84a.55bf3",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -22,1885 +22,1885 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 305,\r
-        "y": 146.888916015625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 191,\r
+        "y": 144.888916015625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "5f52c1a1.066a8"\r
+                "66a22ecb.fd2f58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f52c1a1.066a8",\r
+        "id": "66a22ecb.fd2f58",\r
         "type": "method",\r
         "name": "method update-network-links-to-aai",\r
         "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 319,\r
-        "y": 223.22222900390625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 205,\r
+        "y": 221.22222900390625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "d4e648b5.a39fa8"\r
+                "6e3553b1.ce5dcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4e648b5.a39fa8",\r
+        "id": "6e3553b1.ce5dcc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 330.33343505859375,\r
-        "y": 300.7779235839844,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 216.33343505859375,\r
+        "y": 298.7779235839844,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "e5c5d545.9d86e8"\r
+                "ce48b85e.94f938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "367c2dd.186e752",\r
+        "id": "a43a6e87.7bb85",\r
         "type": "update",\r
         "name": "save logical-link with regular id",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1205.111083984375,\r
-        "y": 725.111083984375,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1091.111083984375,\r
+        "y": 723.111083984375,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e5c5d545.9d86e8",\r
+        "id": "ce48b85e.94f938",\r
         "type": "for",\r
         "name": "for each link",\r
         "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 358.88885498046875,\r
-        "y": 394.33331298828125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 244.88885498046875,\r
+        "y": 392.33331298828125,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c535a196.07d77",\r
-                "2b697423.656f74",\r
-                "23c74055.452fd8",\r
-                "357884ff.889364",\r
-                "5d91edd1.3c2f24"\r
+                "dec42fbf.1e3dc8",\r
+                "faf4c2c8.a313e8",\r
+                "6624aa74.606e14",\r
+                "dbc86076.1de4f",\r
+                "4c4fa03a.a50f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c535a196.07d77",\r
+        "id": "dec42fbf.1e3dc8",\r
         "type": "set",\r
         "name": "set network link's local variables",\r
         "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",\r
         "comments": "",\r
-        "x": 691.111083984375,\r
-        "y": 99.22221374511719,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 577.111083984375,\r
+        "y": 97.22221374511719,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a0f4814.b217",\r
+        "id": "9f28786b.9755c",\r
         "type": "for",\r
         "name": "for each label-restriction",\r
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1731.4444580078125,\r
-        "y": 945.111083984375,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1617.4444580078125,\r
+        "y": 943.111083984375,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "2cea987d.04721",\r
-                "76b35791.18f63",\r
-                "2f963aac.304aa6",\r
-                "a173e4f5.f5a478",\r
-                "c921d18d.970b48",\r
-                "15c10484.c4629b"\r
+                "a10e9de3.90e708",\r
+                "9f6f811c.bccf8",\r
+                "7166bef0.82e4a",\r
+                "c6ea0cbf.fb7cd",\r
+                "441a859d.1c08ec",\r
+                "e1339bff.8f7f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cea987d.04721",\r
+        "id": "a10e9de3.90e708",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
         "comments": "",\r
-        "x": 2036.111328125,\r
-        "y": 910.0000610351562,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1922.111328125,\r
+        "y": 908.0000610351562,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a53b765.67e4408",\r
+        "id": "481ae7ff.84ac9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2149.4998779296875,\r
-        "y": 952.74609375,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2035.4998779296875,\r
+        "y": 950.74609375,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bcb47eec.4c95d8"\r
+                "4b5e8d4c.a2cfc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "987d5f9c.60006",\r
+        "id": "958898b9.8616a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2157.178466796875,\r
-        "y": 1011.9604187011719,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2043.178466796875,\r
+        "y": 1009.9604187011719,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "e46f36b.2789648"\r
+                "76714a99.5b6304"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcb47eec.4c95d8",\r
+        "id": "4b5e8d4c.a2cfc4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2310,\r
-        "y": 952.0000305175781,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2196,\r
+        "y": 950.0000305175781,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "df8ec894.2ce188",\r
+        "id": "1494b149.c9a337",\r
         "type": "set",\r
         "name": "set src-ltpId dst-ltpId",\r
         "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",\r
         "comments": "",\r
-        "x": 2718.5001220703125,\r
-        "y": 2414.545135498047,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2604.5001220703125,\r
+        "y": 2412.545135498047,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed966c58.9421a",\r
+        "id": "ed0f5687.170a7",\r
         "type": "save",\r
         "name": "save srcLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      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/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-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=\"`$src-ltpId`\" />\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2752.0001220703125,\r
-        "y": 2454.545135498047,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2638.0001220703125,\r
+        "y": 2452.545135498047,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c79cef0b.98c06",\r
+        "id": "c964af3.a8439d",\r
         "type": "save",\r
         "name": "save dstLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      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/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-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=\"`$dst-ltpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2752.0001220703125,\r
-        "y": 2494.545135498047,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2638.0001220703125,\r
+        "y": 2492.545135498047,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e46f36b.2789648",\r
+        "id": "76714a99.5b6304",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2341,\r
-        "y": 1012.0000305175781,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2227,\r
+        "y": 1010.0000305175781,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cce10880.3add5",\r
+        "id": "df8f6a30.0e19f",\r
         "type": "save",\r
         "name": "save link relationship to label-restriction in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2052,\r
-        "y": 1208,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1938,\r
+        "y": 1206,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "76b35791.18f63",\r
+        "id": "9f6f811c.bccf8",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1990.815185546875,\r
-        "y": 984.5556640625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1876.815185546875,\r
+        "y": 982.5556640625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "a53b765.67e4408",\r
-                "987d5f9c.60006"\r
+                "481ae7ff.84ac9",\r
+                "958898b9.8616a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bd86154.f4552",\r
+        "id": "e7971b0b.c3d0c",\r
         "type": "switchNode",\r
         "name": "switch te-link-attributes label-restriction_length",\r
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1250,\r
-        "y": 945,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1136,\r
+        "y": 943,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "6ededdc5.cf6c8c",\r
-                "ecaf5041.3bee8",\r
-                "5dbfa8d0.65ebe"\r
+                "d0a27e5d.161cf",\r
+                "c301ff98.2e6928",\r
+                "4d75dbb8.4d6b04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b697423.656f74",\r
+        "id": "faf4c2c8.a313e8",\r
         "type": "switchNode",\r
         "name": "switch link.destination",\r
         "xml": "<switch test='`$link.destination.dest-node`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 667,\r
-        "y": 204,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 553,\r
+        "y": 202,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "6a7d179d.85fe8",\r
-                "e3266b7a.5033d8"\r
+                "998d07b5.34538",\r
+                "4877c101.9ce65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a7d179d.85fe8",\r
+        "id": "998d07b5.34538",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 871,\r
-        "y": 165,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 757,\r
+        "y": 163,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ea7811a5.6557e"\r
+                "c3ced1a5.7034b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3266b7a.5033d8",\r
+        "id": "4877c101.9ce65",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868,\r
-        "y": 227,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 754,\r
+        "y": 225,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "68cf703d.fdacb8"\r
+                "d4197495.299218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68cf703d.fdacb8",\r
+        "id": "d4197495.299218",\r
         "type": "set",\r
         "name": "set network link's destination variables",\r
         "xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",\r
         "comments": "",\r
-        "x": 1097,\r
-        "y": 190,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 983,\r
+        "y": 188,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8b9afa9.8c7938",\r
+        "id": "c382f34.d97691",\r
         "type": "set",\r
         "name": "set is-open-ended-link",\r
         "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",\r
         "comments": "",\r
-        "x": 1275,\r
-        "y": 65,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1161,\r
+        "y": 63,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4445364b.3ff31",\r
+        "id": "ff450949.dbf658",\r
         "type": "save",\r
         "name": "get p-interface from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $unique-src-node-Id\n\t        and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1278,\r
-        "y": 150,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1164,\r
+        "y": 148,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "1fabb633.34a7e2",\r
-                "30ce6e4c.0b0d22",\r
-                "78ec6cbb.d8199c"\r
+                "5da3043a.2acbac",\r
+                "1bf53d3.d439ac3",\r
+                "8f4faa5b.7a92c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fabb633.34a7e2",\r
+        "id": "5da3043a.2acbac",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1521,\r
-        "y": 145,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1407,\r
+        "y": 143,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "f6b85f73.a6bb"\r
+                "ce061615.442fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30ce6e4c.0b0d22",\r
+        "id": "1bf53d3.d439ac3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1519,\r
-        "y": 234,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1405,\r
+        "y": 232,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "112ae233.6a9666"\r
+                "8dce7fe6.cbf1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d37b161.c87e5e",\r
+        "id": "863e663a.20d8f8",\r
         "type": "set",\r
         "name": "set alternative unique link id",\r
         "xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n<!--<parameter name='alt-unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`\" />-->\n\n",\r
         "comments": "",\r
-        "x": 2194,\r
-        "y": 162,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2080,\r
+        "y": 160,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "112ae233.6a9666",\r
+        "id": "8dce7fe6.cbf1f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1688,\r
-        "y": 235,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1574,\r
+        "y": 233,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b25a39cd.f52a6",\r
+        "id": "2b1dcd15.312222",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t    key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 986,\r
-        "y": 671,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 872,\r
+        "y": 669,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "2eac00b.0ddcd8",\r
-                "cef26741.44e878"\r
+                "ec693039.84dc28",\r
+                "3de532fd.f494f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78ec6cbb.d8199c",\r
+        "id": "8f4faa5b.7a92c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1530.490966796875,\r
-        "y": 187.57403564453125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1416.490966796875,\r
+        "y": 185.57403564453125,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "cc3c7aa7.507dd8"\r
+                "788cf8a5.93c298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc3c7aa7.507dd8",\r
+        "id": "788cf8a5.93c298",\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.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1684.0623779296875,\r
-        "y": 190.85977172851562,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1570.0623779296875,\r
+        "y": 188.85977172851562,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "339fe7b3.ae4e",\r
+        "id": "98f67a1e.d79eb",\r
         "type": "switchNode",\r
         "name": "switch is-open-ended-link",\r
         "xml": "<switch test='`$is-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565,\r
-        "y": 710,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 451,\r
+        "y": 708,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "7bffce42.060d68",\r
-                "601fa3d8.aedcac"\r
+                "6cd18165.d49da8",\r
+                "a4b87205.849aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bffce42.060d68",\r
+        "id": "6cd18165.d49da8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782,\r
-        "y": 732,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 668,\r
+        "y": 730,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "d9f05462.4a8968"\r
+                "6eb10efe.79be58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "601fa3d8.aedcac",\r
+        "id": "a4b87205.849aa",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 785,\r
-        "y": 672,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 671,\r
+        "y": 670,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "b25a39cd.f52a6"\r
+                "2b1dcd15.312222"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eac00b.0ddcd8",\r
+        "id": "ec693039.84dc28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1230,\r
-        "y": 341,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1116,\r
+        "y": 339,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "d26336.070c9cc8"\r
+                "7e014e1e.a8dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cef26741.44e878",\r
+        "id": "3de532fd.f494f6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1255.490966796875,\r
-        "y": 536.5740356445312,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1141.490966796875,\r
+        "y": 534.5740356445312,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "1417b1e7.adccae"\r
+                "308dc22b.73a67e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f57eec.3fa43",\r
+        "id": "2e5d2820.63e8c",\r
         "type": "update",\r
         "name": "save logical-link with alternative link id",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n<parameter name='link-role' value='cross-domain' />\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1727,\r
-        "y": 558,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1613,\r
+        "y": 556,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9f05462.4a8968",\r
+        "id": "6eb10efe.79be58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 960,\r
-        "y": 740,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 846,\r
+        "y": 738,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "367c2dd.186e752",\r
-                "6bd86154.f4552",\r
-                "8c3bc53e.020c3",\r
-                "3b98d33.38a2bac",\r
-                "9f4e28fe.9e925"\r
+                "a43a6e87.7bb85",\r
+                "e7971b0b.c3d0c",\r
+                "a6b6ae44.7eb2a8",\r
+                "370b414a.4eba76",\r
+                "4aadddbd.521a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "882e1409.701ce8",\r
+        "id": "521f891d.91cfc8",\r
         "type": "save",\r
         "name": "update dest TP by putting src TP of the current link",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\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=\"`$src-tpId`\" />-->\n\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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2641,\r
-        "y": 387,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2527,\r
+        "y": 385,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "a1bfa8c8.032428",\r
-                "4552885e.7227f8"\r
+                "27e614a8.33d2f4",\r
+                "5b692078.dcecc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c1006a1.c0bf28",\r
+        "id": "6468635a.9e6d94",\r
         "type": "save",\r
         "name": "save source and dest TP",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1190,\r
-        "y": 1179,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1076,\r
+        "y": 1177,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ea7811a5.6557e",\r
+        "id": "c3ced1a5.7034b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1059,\r
-        "y": 126,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 945,\r
+        "y": 124,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "d8b9afa9.8c7938",\r
-                "4445364b.3ff31",\r
-                "78b9c95f.ae17e8"\r
+                "c382f34.d97691",\r
+                "ff450949.dbf658",\r
+                "b85c23da.8517d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1417b1e7.adccae",\r
+        "id": "308dc22b.73a67e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1444,\r
-        "y": 539,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1330,\r
+        "y": 537,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c9f57eec.3fa43",\r
-                "fe6e139a.88d838",\r
-                "1e861048.9f807",\r
-                "fc9bbbc9.76dd6"\r
+                "2e5d2820.63e8c",\r
+                "3996c800.afa0a8",\r
+                "d3a8ab71.fccb7",\r
+                "6c137df8.722b8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe6e139a.88d838",\r
+        "id": "3996c800.afa0a8",\r
         "type": "save",\r
         "name": "save source only",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1656,\r
-        "y": 619,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1542,\r
+        "y": 617,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ed1851cd.c2d2d",\r
+        "id": "51ef22a.000c3dc",\r
         "type": "for",\r
         "name": "for each label-restriction",\r
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2183,\r
-        "y": 745,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2069,\r
+        "y": 743,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bf2a36f0.0411c",\r
-                "1a178b14.9ad4dd",\r
-                "13838be4.d07ac4",\r
-                "ec158e78.eb2b58",\r
-                "a3570d8f.6b641",\r
-                "1375d0c1.e8bf07"\r
+                "cb31166c.2edd2",\r
+                "db1f7d98.2def68",\r
+                "c4dd69cd.d872b",\r
+                "f581a4e4.841408",\r
+                "f2fac409.beeaf8",\r
+                "ea1f1d76.87207"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf2a36f0.0411c",\r
+        "id": "cb31166c.2edd2",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 2473.6669921875,\r
-        "y": 623.8889770507812,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2359.6669921875,\r
+        "y": 621.8889770507812,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb573572.449a5",\r
+        "id": "1dcb5e38.622da2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2615.0555419921875,\r
-        "y": 702.635009765625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2501.0555419921875,\r
+        "y": 700.635009765625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "80720656.40f1f8"\r
+                "2526017c.1c252e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5ad824b.fd1c3",\r
+        "id": "19906550.30ac83",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2622.734130859375,\r
-        "y": 761.8493347167969,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2508.734130859375,\r
+        "y": 759.8493347167969,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "75cc9002.94bbf8"\r
+                "52d0ed95.142f34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80720656.40f1f8",\r
+        "id": "2526017c.1c252e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2775.5556640625,\r
-        "y": 701.8889465332031,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2661.5556640625,\r
+        "y": 699.8889465332031,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75cc9002.94bbf8",\r
+        "id": "52d0ed95.142f34",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2806.5556640625,\r
-        "y": 761.8889465332031,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2692.5556640625,\r
+        "y": 759.8889465332031,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cb668db0.48c4b",\r
+        "id": "e7979ea6.dbce4",\r
         "type": "save",\r
         "name": "save link relationship to label-restriction in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2482.5556640625,\r
-        "y": 894.888916015625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2368.5556640625,\r
+        "y": 892.888916015625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1a178b14.9ad4dd",\r
+        "id": "db1f7d98.2def68",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2424.370849609375,\r
-        "y": 734.444580078125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2310.370849609375,\r
+        "y": 732.444580078125,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "eb573572.449a5",\r
-                "e5ad824b.fd1c3"\r
+                "1dcb5e38.622da2",\r
+                "19906550.30ac83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23c74055.452fd8",\r
+        "id": "6624aa74.606e14",\r
         "type": "set",\r
         "name": "set more local variables",\r
         "xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",\r
         "comments": "",\r
-        "x": 668,\r
-        "y": 149,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 554,\r
+        "y": 147,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93546ba2.1bedb8",\r
+        "id": "6e337c6f.cd362c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1610,\r
-        "y": 62,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1496,\r
+        "y": 60,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6b85f73.a6bb",\r
+        "id": "ce061615.442fb",\r
         "type": "switchNode",\r
         "name": "switch inter-domain-plug-id of the src tp",\r
         "xml": "<switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1760,\r
-        "y": 142,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1646,\r
+        "y": 140,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "905e14d2.8e13d",\r
-                "56d86a80.47b554"\r
+                "a445a8a1.87665",\r
+                "7abf5d27.d789e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "905e14d2.8e13d",\r
+        "id": "a445a8a1.87665",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1990,\r
-        "y": 89,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1876,\r
+        "y": 87,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "39191ee3.a2421a"\r
+                "85dfc9e9.b205a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56d86a80.47b554",\r
+        "id": "7abf5d27.d789e4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1994,\r
-        "y": 162,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1880,\r
+        "y": 160,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "2d37b161.c87e5e"\r
+                "863e663a.20d8f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39191ee3.a2421a",\r
+        "id": "85dfc9e9.b205a8",\r
         "type": "set",\r
         "name": "unset is-open-ended-link",\r
         "xml": "<set>\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='true' />\n\n",\r
         "comments": "",\r
-        "x": 2178,\r
-        "y": 85,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2064,\r
+        "y": 83,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ecef5c2.0f02ca",\r
+        "id": "5df859b8.6bf788",\r
         "type": "save",\r
         "name": "delete logical-link",\r
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\" \n\tkey=\"logical-link.link-name = $tmp.link-name\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2159,\r
-        "y": 34,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2045,\r
+        "y": 32,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "357884ff.889364",\r
+        "id": "dbc86076.1de4f",\r
         "type": "set",\r
         "name": "unset network link's local variables",\r
         "xml": "<set>\n<parameter name='link.' value='' />\n<parameter name='dst-tpId' value='' />\n<parameter name='unique-dst-node-Id' value='' />\n<parameter name='is-open-ended-link' value='false' />\n<parameter name='is-invalid-open-ended-link' value='false' />\n\n",\r
         "comments": "",\r
-        "x": 696,\r
-        "y": 41,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 582,\r
+        "y": 39,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37660aa6.c865c6",\r
+        "id": "5be7d94e.325bd",\r
         "type": "switchNode",\r
         "name": "switch is-invalid-open-ended-link",\r
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 786,\r
-        "y": 1157,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 672,\r
+        "y": 1155,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "f54e3efd.634a38",\r
-                "8022555f.169df8"\r
+                "3a021903.aa35de",\r
+                "bd6a87fb.60cad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8022555f.169df8",\r
+        "id": "bd6a87fb.60cad",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993,\r
-        "y": 1125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 879,\r
+        "y": 1123,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "e44bc7ce.ed35b8"\r
+                "7d536275.1f7f6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f54e3efd.634a38",\r
+        "id": "3a021903.aa35de",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 990,\r
-        "y": 1185,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 876,\r
+        "y": 1183,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "7c1006a1.c0bf28"\r
+                "6468635a.9e6d94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e44bc7ce.ed35b8",\r
+        "id": "7d536275.1f7f6c",\r
         "type": "save",\r
         "name": "save source only",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1173,\r
-        "y": 1124,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1059,\r
+        "y": 1122,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6e0155a0.4236dc",\r
+        "id": "c290c25a.9cb058",\r
         "type": "switchNode",\r
         "name": "switch relationship-list_length",\r
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1502,\r
-        "y": 314,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1388,\r
+        "y": 312,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c6d7c8ac.8edfe",\r
-                "e1f14b0f.6d7378",\r
-                "863a7ad.fb20188"\r
+                "8171cd76.e9b4d",\r
+                "9c1be6a.eb1c998",\r
+                "be2751bf.fc2318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64886b03.3e43e4",\r
+        "id": "8ea0dfd0.e04d5",\r
         "type": "switchNode",\r
         "name": "switch relationship-list_length != $src-tpId",\r
         "xml": "<switch test='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value != $src-tpId`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1953,\r
-        "y": 328,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1839,\r
+        "y": 326,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "b3998350.44919"\r
+                "f6fe2af1.32bcd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6d7c8ac.8edfe",\r
+        "id": "8171cd76.e9b4d",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1720,\r
-        "y": 273,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1606,\r
+        "y": 271,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ae0ebd2c.ab0408"\r
+                "6d799180.26117"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1f14b0f.6d7378",\r
+        "id": "9c1be6a.eb1c998",\r
         "type": "outcome",\r
         "name": "1",\r
         "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1717,\r
-        "y": 310,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1603,\r
+        "y": 308,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "64886b03.3e43e4"\r
+                "8ea0dfd0.e04d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "863a7ad.fb20188",\r
+        "id": "be2751bf.fc2318",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1727,\r
-        "y": 384,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1613,\r
+        "y": 382,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "8fdcd683.3660b"\r
+                "a1d91cb.fcaede"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fdcd683.3660b",\r
+        "id": "a1d91cb.fcaede",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1864,\r
-        "y": 385,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1750,\r
+        "y": 383,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ec1a3a53.fa7ff8"\r
+                "9a538487.c08aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae0ebd2c.ab0408",\r
+        "id": "6d799180.26117",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1862,\r
-        "y": 281,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1748,\r
+        "y": 279,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c29cb556.f4deb8"\r
+                "92abbd48.ac3ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d91edd1.3c2f24",\r
+        "id": "4c4fa03a.a50f2",\r
         "type": "switchNode",\r
         "name": "switch is-invalid-open-ended-link",\r
         "xml": "<switch test='`$is-invalid-open-ended-link`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 563,\r
-        "y": 538,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 449,\r
+        "y": 536,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "62e07412.96bbe4",\r
-                "db9d2b02.3f6e5"\r
+                "7a803037.7fbd88",\r
+                "a043c19c.e11a18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db9d2b02.3f6e5",\r
+        "id": "a043c19c.e11a18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770,\r
-        "y": 506,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 656,\r
+        "y": 504,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "7150962.0cacbe8"\r
+                "2aea0930.46cd5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62e07412.96bbe4",\r
+        "id": "7a803037.7fbd88",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 767,\r
-        "y": 566,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 653,\r
+        "y": 564,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "339fe7b3.ae4e"\r
+                "98f67a1e.d79eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7150962.0cacbe8",\r
+        "id": "2aea0930.46cd5e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921,\r
-        "y": 506,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 807,\r
+        "y": 504,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8c3bc53e.020c3",\r
+        "id": "a6b6ae44.7eb2a8",\r
         "type": "save",\r
         "name": "save source and dest TP",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1188,\r
-        "y": 828,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1074,\r
+        "y": 826,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b3998350.44919",\r
+        "id": "f6fe2af1.32bcd",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2200,\r
-        "y": 319,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2086,\r
+        "y": 317,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3b98d33.38a2bac",\r
+        "id": "370b414a.4eba76",\r
         "type": "record",\r
         "name": "log file",\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=\"uniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"dstTpId\" />\n    <parameter name=\"field7\" value=\"`$dst-tpId`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1133,\r
-        "y": 773,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1019,\r
+        "y": 771,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "78b9c95f.ae17e8",\r
+        "id": "b85c23da.8517d",\r
         "type": "set",\r
         "name": "unset tmp.aai.p-interface",\r
         "xml": "<set>\n<parameter name='tmp.aai.p-interface' value='' />\n<parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\n\n",\r
         "comments": "",\r
-        "x": 1276,\r
-        "y": 103,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1162,\r
+        "y": 101,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7f9432f.fc4c28",\r
+        "id": "e0d728fb.03e448",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMerge.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2516,\r
-        "y": 291,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2402,\r
+        "y": 289,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d26336.070c9cc8",\r
+        "id": "7e014e1e.a8dd8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2192,\r
-        "y": 536,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2078,\r
+        "y": 534,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c7f9432f.fc4c28",\r
-                "882e1409.701ce8",\r
-                "6e4bc51.b0c9dbc",\r
-                "7a9fabbe.629c44"\r
+                "e0d728fb.03e448",\r
+                "521f891d.91cfc8",\r
+                "cedaeaf5.78fef8",\r
+                "740002f8.4aedac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1bfa8c8.032428",\r
+        "id": "27e614a8.33d2f4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2930,\r
-        "y": 357,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2816,\r
+        "y": 355,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "c9e17582.5ea8"\r
+                "c5f6a36b.0845d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4552885e.7227f8",\r
+        "id": "5b692078.dcecc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2937.6785888671875,\r
-        "y": 416.2143249511719,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2823.6785888671875,\r
+        "y": 414.2143249511719,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "de1c7c10.d4de68"\r
+                "b2044c9b.8096a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9e17582.5ea8",\r
+        "id": "c5f6a36b.0845d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3078,\r
-        "y": 352,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2964,\r
+        "y": 350,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "747beccb.60a274"\r
+                "ad2b40a6.ff37f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "747beccb.60a274",\r
+        "id": "ad2b40a6.ff37f8",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMergeSuccess.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3223,\r
-        "y": 352,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3109,\r
+        "y": 350,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de1c7c10.d4de68",\r
+        "id": "b2044c9b.8096a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3085,\r
-        "y": 414,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2971,\r
+        "y": 412,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "81d2a002.7c0388"\r
+                "a8dbf2db.72f548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c29cb556.f4deb8",\r
+        "id": "92abbd48.ac3ab",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"noRelationshipForLink:\" />\n    <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1998,\r
-        "y": 279,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1884,\r
+        "y": 277,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ec1a3a53.fa7ff8",\r
+        "id": "9a538487.c08aa",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logNoRelationship.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"moreThanOneRelationshipForLink:\" />\n    <parameter name=\"field3\" value=\"`$tmp.aai.logical-link.link-name`\" />\n    <parameter name=\"field4\" value=\"HowMany:\" />\n    <parameter name=\"field5\" value=\"`$tmp.aai.logical-link.relationship-list_length`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2009,\r
-        "y": 394,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1895,\r
+        "y": 392,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "81d2a002.7c0388",\r
+        "id": "a8dbf2db.72f548",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logMergeFailure.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"altUniqueLinkId\" />\n    <parameter name=\"field3\" value=\"`$alt-unique-linkId`\" />\n    <parameter name=\"field4\" value=\"srcTpId\" />\n    <parameter name=\"field5\" value=\"`$src-tpId`\" />\n    <parameter name=\"field6\" value=\"relationship-value\" />\n    <parameter name=\"field7\" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3230,\r
-        "y": 414,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3116,\r
+        "y": 412,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6ededdc5.cf6c8c",\r
+        "id": "d0a27e5d.161cf",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1544,\r
-        "y": 843,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1430,\r
+        "y": 841,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "13eb321c.419dee"\r
+                "53c3433b.ea3fa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecaf5041.3bee8",\r
+        "id": "c301ff98.2e6928",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546,\r
-        "y": 891,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1432,\r
+        "y": 889,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "13eb321c.419dee"\r
+                "53c3433b.ea3fa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dbfa8d0.65ebe",\r
+        "id": "4d75dbb8.4d6b04",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1543,\r
-        "y": 945,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1429,\r
+        "y": 943,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "3a0f4814.b217"\r
+                "9f28786b.9755c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13eb321c.419dee",\r
+        "id": "53c3433b.ea3fa4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1699,\r
-        "y": 843,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1585,\r
+        "y": 841,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1e861048.9f807",\r
+        "id": "d3a8ab71.fccb7",\r
         "type": "switchNode",\r
         "name": "switch te-link-attributes label-restriction_length",\r
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1725,\r
-        "y": 736,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1611,\r
+        "y": 734,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "f4fbab89.9ba908",\r
-                "7dc7ac6a.dc9714",\r
-                "4d8c04cc.f4e3d4"\r
+                "d2a47af.0c53388",\r
+                "6ac8d49a.12d694",\r
+                "7da4e2ad.ccfb34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4fbab89.9ba908",\r
+        "id": "d2a47af.0c53388",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1997,\r
-        "y": 646,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1883,\r
+        "y": 644,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bc7188dd.cc9d18"\r
+                "70211305.a9bd74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc7188dd.cc9d18",\r
+        "id": "70211305.a9bd74",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2152,\r
-        "y": 646,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2038,\r
+        "y": 644,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7dc7ac6a.dc9714",\r
+        "id": "6ac8d49a.12d694",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1999,\r
-        "y": 694,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1885,\r
+        "y": 692,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bc7188dd.cc9d18"\r
+                "70211305.a9bd74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d8c04cc.f4e3d4",\r
+        "id": "7da4e2ad.ccfb34",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1998,\r
-        "y": 745,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1884,\r
+        "y": 743,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ed1851cd.c2d2d"\r
+                "51ef22a.000c3dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13838be4.d07ac4",\r
+        "id": "c4dd69cd.d872b",\r
         "type": "set",\r
         "name": "unset label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 2479,\r
-        "y": 572,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2365,\r
+        "y": 570,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f963aac.304aa6",\r
+        "id": "7166bef0.82e4a",\r
         "type": "set",\r
         "name": "unset label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 2033,\r
-        "y": 799,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1919,\r
+        "y": 797,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e4bc51.b0c9dbc",\r
+        "id": "cedaeaf5.78fef8",\r
         "type": "switchNode",\r
         "name": "switch te-link-attributes label-restriction_length",\r
         "xml": "<switch test='`$link.te.te-link-attributes.label-restriction_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2817,\r
-        "y": 523,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2703,\r
+        "y": 521,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "30a1d0ca.e887a",\r
-                "92fd4ff1.3a409",\r
-                "389e55ce.061fe2"\r
+                "e2267c99.350348",\r
+                "3e0a9900.cec47e",\r
+                "ab55b067.791f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30a1d0ca.e887a",\r
+        "id": "e2267c99.350348",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3087,\r
-        "y": 485,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2973,\r
+        "y": 483,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "5dda79fd.751e4"\r
+                "8e66b008.2f7c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dda79fd.751e4",\r
+        "id": "8e66b008.2f7c48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3242,\r
-        "y": 485,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3128,\r
+        "y": 483,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "92fd4ff1.3a409",\r
+        "id": "3e0a9900.cec47e",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3089,\r
-        "y": 533,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2975,\r
+        "y": 531,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "5dda79fd.751e4"\r
+                "8e66b008.2f7c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "389e55ce.061fe2",\r
+        "id": "ab55b067.791f5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3088,\r
-        "y": 584,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2974,\r
+        "y": 582,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bc1a2664.a26998"\r
+                "ef26b767.51cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc1a2664.a26998",\r
+        "id": "ef26b767.51cb",\r
         "type": "for",\r
         "name": "for each label-restriction",\r
         "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3273,\r
-        "y": 584,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3159,\r
+        "y": 582,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "bc3590a8.aace38",\r
-                "c370620b.230e48",\r
-                "a5a0665d.651de8",\r
-                "1ab3f9a3.2d2bce",\r
-                "fed3d208.8682f8",\r
-                "864febfd.65faf"\r
+                "1e98f683.1aa1c9",\r
+                "fb05e52d.520ed8",\r
+                "d6c4c7a0.0d9e8",\r
+                "c76088aa.f470c8",\r
+                "4bfdac8d.42ab7c",\r
+                "fab9bbde.d7c01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5a0665d.651de8",\r
+        "id": "d6c4c7a0.0d9e8",\r
         "type": "set",\r
         "name": "unset label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='' />\n<parameter name='unique-lrId' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 3571,\r
-        "y": 399,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3457,\r
+        "y": 397,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bc3590a8.aace38",\r
+        "id": "1e98f683.1aa1c9",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 3560.6669921875,\r
-        "y": 445.88897705078125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3446.6669921875,\r
+        "y": 443.88897705078125,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c370620b.230e48",\r
+        "id": "fb05e52d.520ed8",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3514.370849609375,\r
-        "y": 573.444580078125,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3400.370849609375,\r
+        "y": 571.444580078125,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "fa7d62b3.003ef",\r
-                "8c2cda96.78942"\r
+                "d9005ccd.b320e8",\r
+                "c6b7c3e3.521e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bad7ff54.e113a8",\r
+        "id": "9c6aaa8e.65077",\r
         "type": "save",\r
         "name": "save link relationship to label-restriction in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3588.5556640625,\r
-        "y": 757.888916015625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3474.5556640625,\r
+        "y": 755.888916015625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa7d62b3.003ef",\r
+        "id": "d9005ccd.b320e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3705.0555419921875,\r
-        "y": 541.635009765625,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3591.0555419921875,\r
+        "y": 539.635009765625,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ee15e7b0.52d0f8"\r
+                "85dd0f0d.ac434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c2cda96.78942",\r
+        "id": "c6b7c3e3.521e98",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3712.734130859375,\r
-        "y": 600.8493347167969,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3598.734130859375,\r
+        "y": 598.8493347167969,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             [\r
-                "ed52377e.4eb4a"\r
+                "d138a600.db5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee15e7b0.52d0f8",\r
+        "id": "85dd0f0d.ac434",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3865.5556640625,\r
-        "y": 540.8889465332031,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3751.5556640625,\r
+        "y": 538.8889465332031,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ed52377e.4eb4a",\r
+        "id": "d138a600.db5b8",\r
         "type": "update",\r
         "name": "save label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\n<parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3896.5556640625,\r
-        "y": 600.8889465332031,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3782.5556640625,\r
+        "y": 598.8889465332031,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1ab3f9a3.2d2bce",\r
+        "id": "c76088aa.f470c8",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
         "comments": "",\r
-        "x": 3561,\r
-        "y": 495,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3447,\r
+        "y": 493,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec158e78.eb2b58",\r
+        "id": "f581a4e4.841408",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",\r
         "comments": "",\r
-        "x": 2475,\r
-        "y": 664,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2361,\r
+        "y": 662,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a173e4f5.f5a478",\r
+        "id": "c6ea0cbf.fb7cd",\r
         "type": "set",\r
         "name": "set label-restriction's local variables",\r
         "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 2030,\r
-        "y": 851,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1916,\r
+        "y": 849,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f4e28fe.9e925",\r
+        "id": "4aadddbd.521a8c",\r
         "type": "update",\r
         "name": "save te-link-attribute",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1171,\r
-        "y": 873,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1057,\r
+        "y": 871,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "15c10484.c4629b",\r
+        "id": "e1339bff.8f7f98",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2062,\r
-        "y": 1142,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1948,\r
+        "y": 1140,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c921d18d.970b48",\r
+        "id": "441a859d.1c08ec",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to logical-link in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-linkId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2071,\r
-        "y": 1082,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1957,\r
+        "y": 1080,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc9bbbc9.76dd6",\r
+        "id": "6c137df8.722b8c",\r
         "type": "update",\r
         "name": "save te-link-attribute",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1662,\r
-        "y": 671,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 1548,\r
+        "y": 669,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a9fabbe.629c44",\r
+        "id": "740002f8.4aedac",\r
         "type": "update",\r
         "name": "update te-link-attribute",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' >      \n<parameter name='id' value='`$link.te.te-link-attributes.name`' />\n<parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2542,\r
-        "y": 456,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2428,\r
+        "y": 454,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a3570d8f.6b641",\r
+        "id": "f2fac409.beeaf8",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to logical-link in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2507,\r
-        "y": 802,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2393,\r
+        "y": 800,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1375d0c1.e8bf07",\r
+        "id": "ea1f1d76.87207",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2500,\r
-        "y": 848,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 2386,\r
+        "y": 846,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "864febfd.65faf",\r
+        "id": "fab9bbde.d7c01",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to label-restriction",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3597,\r
-        "y": 700,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3483,\r
+        "y": 698,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fed3d208.8682f8",\r
+        "id": "4bfdac8d.42ab7c",\r
         "type": "save",\r
         "name": "save te-link-attribute relationship to logical-link in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \n      key='te-link-attribute.id = $link.te.te-link-attributes.name' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $alt-unique-linkId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$alt-unique-linkId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3604,\r
-        "y": 654,\r
-        "z": "42ade40f.4fa29c",\r
+        "x": 3490,\r
+        "y": 652,\r
+        "z": "3cbec5d5.54ea02",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 7b6731c..d87fd49 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "ef88be3f.517f78",\r
+        "id": "b9fcda31.4ec79",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 105,\r
-        "y": 67,\r
+        "x": 113,\r
+        "y": 65.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "74a7a837.229be"\r
+                "3760ce9c.1bf2e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74a7a837.229be",\r
+        "id": "3760ce9c.1bf2e2",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -22,879 +22,879 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 194.00003051757812,\r
-        "y": 157.88891220092773,\r
+        "x": 202.00003051757812,\r
+        "y": 155.89541244506836,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "284dae72.737532"\r
+                "de74005b.f44ce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "284dae72.737532",\r
+        "id": "de74005b.f44ce8",\r
         "type": "method",\r
         "name": "update-network-to-aai",\r
         "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 230.1112518310547,\r
-        "y": 228.22223663330078,\r
+        "x": 238.1112518310547,\r
+        "y": 226.2287368774414,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "da05320e.186d48"\r
+                "1541ad9c.69aa8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da05320e.186d48",\r
+        "id": "1541ad9c.69aa8a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 455.33343505859375,\r
-        "y": 227.77792358398438,\r
+        "x": 463.33343505859375,\r
+        "y": 225.784423828125,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "8c187a81.9e4d28",\r
-                "75113293.98ea0c",\r
-                "9937b93d.ff5938",\r
-                "55dde830.cc61b8",\r
-                "f7667eb6.ec8938"\r
+                "dbbcebe5.6f422",\r
+                "e66d9ed0.3d3d8",\r
+                "f1256a59.e632c",\r
+                "1dca15d7.0a7a3a",\r
+                "1c1d34a0.adaa8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75113293.98ea0c",\r
+        "id": "e66d9ed0.3d3d8",\r
         "type": "save",\r
         "name": "save network-resource",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 685.333251953125,\r
-        "y": 133.00001525878906,\r
+        "x": 693.333251953125,\r
+        "y": 131.0065155029297,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "74f65e67.75c658",\r
+        "id": "40545c4b.9221f4",\r
         "type": "save",\r
         "name": "save pnf",\r
         "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": 897.1111450195312,\r
-        "y": 223.111083984375,\r
+        "x": 905.1111450195312,\r
+        "y": 221.11758422851562,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9937b93d.ff5938",\r
+        "id": "f1256a59.e632c",\r
         "type": "for",\r
         "name": "for each node",\r
         "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668.8888549804688,\r
-        "y": 203.33331298828125,\r
+        "x": 676.8888549804688,\r
+        "y": 201.33981323242188,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "74f65e67.75c658",\r
-                "60e29b35.16fbd4",\r
-                "b27f201.393186",\r
-                "e83884ed.3fb2d8",\r
-                "7257c53.4f087bc",\r
-                "395bef40.08498",\r
-                "1392eb55.76adbd",\r
-                "e55192de.2cc998",\r
-                "a1ffb2f2.4b50b8"\r
+                "40545c4b.9221f4",\r
+                "eba2ef35.33c428",\r
+                "4817116d.5f593",\r
+                "466a40bd.9d277",\r
+                "1acdca56.b6e67e",\r
+                "3e1f14bc.ee90c4",\r
+                "6de7541f.0e2a24",\r
+                "8794be9f.289a08",\r
+                "1b6896a8.e62c19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60e29b35.16fbd4",\r
+        "id": "eba2ef35.33c428",\r
         "type": "set",\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": 902.111083984375,\r
-        "y": 119.22221374511719,\r
+        "x": 910.111083984375,\r
+        "y": 117.22871398925781,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e83884ed.3fb2d8",\r
+        "id": "466a40bd.9d277",\r
         "type": "save",\r
         "name": "save pnf relationship to network-resource in AAI",\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": 993.7779541015625,\r
-        "y": 398.44447803497314,\r
+        "x": 1001.7779541015625,\r
+        "y": 396.45097827911377,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9c15e41a.6cfbc8",\r
+        "id": "3d4b777c.0e42f",\r
         "type": "for",\r
         "name": "for each termination point",\r
         "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1279.4444580078125,\r
-        "y": 574.111083984375,\r
+        "x": 1287.4444580078125,\r
+        "y": 572.1175842285156,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "3c657cae.66477c",\r
-                "2e1dc2b9.f23686",\r
-                "8c144095.b1eaf8",\r
-                "9abbad80.6c0f7",\r
-                "ef702ba5.ac71e"\r
+                "95dfcdd1.046e6",\r
+                "1ac320c7.c54f67",\r
+                "aa2f70cf.6e112",\r
+                "64896027.57fb78",\r
+                "fe275075.949f1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c657cae.66477c",\r
+        "id": "95dfcdd1.046e6",\r
         "type": "set",\r
         "name": "set termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 1549.111328125,\r
-        "y": 557.0000610351562,\r
+        "x": 1557.111328125,\r
+        "y": 555.0065612792969,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c144095.b1eaf8",\r
+        "id": "aa2f70cf.6e112",\r
         "type": "save",\r
         "name": "save p-interface",\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": 1543.815185546875,\r
-        "y": 744.5556030273438,\r
+        "x": 1551.815185546875,\r
+        "y": 742.5621032714844,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "3fc33363.5b82ec",\r
-                "34c813e4.f5477c"\r
+                "673078d4.a5cb68",\r
+                "5651def0.2c85b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6e5129a.8bd048",\r
+        "id": "6cce4024.476ad",\r
         "type": "save",\r
         "name": "save pnf relationship to p-interface in AAI",\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": 1626.703857421875,\r
-        "y": 901.3333740234375,\r
+        "x": 1634.703857421875,\r
+        "y": 899.3398742675781,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e1dc2b9.f23686",\r
+        "id": "1ac320c7.c54f67",\r
         "type": "set",\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": 1533.000244140625,\r
-        "y": 614.111083984375,\r
+        "x": 1541.000244140625,\r
+        "y": 612.1175842285156,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c187a81.9e4d28",\r
+        "id": "dbbcebe5.6f422",\r
         "type": "execute",\r
         "name": "execute",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 641.9935302734375,\r
-        "y": 41.993499755859375,\r
+        "x": 649.9935302734375,\r
+        "y": 40,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b27f201.393186",\r
+        "id": "4817116d.5f593",\r
         "type": "save",\r
         "name": "save pnf relation with esr-thirdparty-sdnc",\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": 975,\r
-        "y": 434.9934997558594,\r
+        "x": 983,\r
+        "y": 433,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3fc33363.5b82ec",\r
+        "id": "673078d4.a5cb68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1715.499885559082,\r
-        "y": 731.7460784912109,\r
+        "x": 1723.499885559082,\r
+        "y": 729.7525787353516,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "a873419b.bc81c"\r
+                "72e23ce3.0ceb8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34c813e4.f5477c",\r
+        "id": "5651def0.2c85b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1709.1784744262695,\r
-        "y": 783.9603900909424,\r
+        "x": 1717.1784744262695,\r
+        "y": 781.966890335083,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "66113f50.7819f8"\r
+                "936d0942.79b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a873419b.bc81c",\r
+        "id": "72e23ce3.0ceb8c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1866.0000457763672,\r
-        "y": 731.0000095367432,\r
+        "x": 1874.0000457763672,\r
+        "y": 729.0065097808838,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "66113f50.7819f8",\r
+        "id": "936d0942.79b6",\r
         "type": "update",\r
         "name": "update p-interface",\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": 1895,\r
-        "y": 785,\r
+        "x": 1903,\r
+        "y": 783.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c8e5472a.d10408",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1678,\r
-        "y": 331,\r
+        "x": 1686,\r
+        "y": 329.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "11cb3cf8.02c3eb",\r
-                "1a336806.ba4bc8"\r
+                "ee093e46.66c7d8",\r
+                "e9c7ad6a.1577f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b0a557c.b35cd",\r
+        "id": "3a45511d.adcf26",\r
         "type": "for",\r
         "name": "for each tunnel termination point",\r
         "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1341,\r
-        "y": 319,\r
+        "x": 1349,\r
+        "y": 317.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "58c4d943.63d2f",\r
-                "e7e93cd.8f563c",\r
-                "c8e5472a.d10408",\r
-                "7c00c858.c87ab8",\r
-                "1bd07bf.99e9784"\r
+                "2ea4deaf.40bdfa",\r
+                "458ce581.77bfe4",\r
+                "7077dcc4.1aa314",\r
+                "dad1a90d.61b018",\r
+                "7da29c03.1dbdf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58c4d943.63d2f",\r
+        "id": "2ea4deaf.40bdfa",\r
         "type": "set",\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": 1676,\r
-        "y": 239,\r
+        "x": 1684,\r
+        "y": 237.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7e93cd.8f563c",\r
+        "id": "458ce581.77bfe4",\r
         "type": "set",\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": 1634.888916015625,\r
-        "y": 277.111083984375,\r
+        "x": 1642.888916015625,\r
+        "y": 275.1175842285156,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11cb3cf8.02c3eb",\r
+        "id": "ee093e46.66c7d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1944,\r
-        "y": 317,\r
+        "x": 1952,\r
+        "y": 315.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "9ad375c8.fab3e8"\r
+                "1b7d5a60.835d5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a336806.ba4bc8",\r
+        "id": "e9c7ad6a.1577f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1937.6785888671875,\r
-        "y": 369.21431159973145,\r
+        "x": 1945.6785888671875,\r
+        "y": 367.22081184387207,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "842e7e75.fc0558"\r
+                "652a4eb1.3c9f7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ad375c8.fab3e8",\r
+        "id": "1b7d5a60.835d5e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2094.500160217285,\r
-        "y": 316.2539310455322,\r
+        "x": 2102.500160217285,\r
+        "y": 314.26043128967285,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "842e7e75.fc0558",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2175,\r
-        "y": 371,\r
+        "x": 2183,\r
+        "y": 369.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7257c53.4f087bc",\r
+        "id": "1acdca56.b6e67e",\r
         "type": "set",\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": 927,\r
-        "y": 166,\r
+        "x": 935,\r
+        "y": 164.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55dde830.cc61b8",\r
+        "id": "1dca15d7.0a7a3a",\r
         "type": "call",\r
         "name": "call update-network-links-to-aai",\r
         "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 611,\r
-        "y": 329,\r
+        "x": 619,\r
+        "y": 327.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b86a9ee9.558c2",\r
+        "id": "c87f71c.204801",\r
         "type": "save",\r
         "name": "save pnf-interface relationship to pnf in AAI",\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": 1627,\r
-        "y": 844,\r
+        "x": 1635,\r
+        "y": 842.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c00c858.c87ab8",\r
+        "id": "dad1a90d.61b018",\r
         "type": "save",\r
         "name": "save pnf relationship to tunnel termination point in AAI",\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[$ttidx].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[$ttidx].related-link`\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`\" value=\"`$unique-ttpId`\" />",\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": 1749,\r
-        "y": 423,\r
+        "x": 1757,\r
+        "y": 421.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "5d32d079.32cfb8",\r
-                "5c2d8774.9a9178"\r
+                "486bef2.804149",\r
+                "8297f8e3.32f2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "395bef40.08498",\r
+        "id": "3e1f14bc.ee90c4",\r
         "type": "switchNode",\r
         "name": "switch node ttp",\r
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913,\r
-        "y": 295,\r
+        "x": 921,\r
+        "y": 293.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "84bf875e.b8d51",\r
-                "cc6df2e.2398e9",\r
-                "f2d2c388.1aa578"\r
+                "3564e5a8.68c49a",\r
+                "fd68b5a4.a3a878",\r
+                "f36d0950.312798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5889c4ed.3fc544",\r
+        "id": "d6240165.9d9a1",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1261,\r
-        "y": 247,\r
+        "x": 1269,\r
+        "y": 245.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f2d2c388.1aa578",\r
+        "id": "f36d0950.312798",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1103,\r
-        "y": 318,\r
+        "x": 1111,\r
+        "y": 316.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "8b0a557c.b35cd"\r
+                "3a45511d.adcf26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1392eb55.76adbd",\r
+        "id": "6de7541f.0e2a24",\r
         "type": "switchNode",\r
         "name": "switch node tp",\r
         "xml": "<switch test='`$node.termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 893,\r
-        "y": 550,\r
+        "x": 901,\r
+        "y": 548.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "c5e649ab.cfe2e8",\r
-                "d7a3de29.b44a1",\r
-                "a21fbfb7.b6608"\r
+                "d28496d2.5ae628",\r
+                "74698dba.4a5d9c",\r
+                "f51e137e.4b4cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5e649ab.cfe2e8",\r
+        "id": "d28496d2.5ae628",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1072,\r
-        "y": 502,\r
+        "x": 1080,\r
+        "y": 500.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "3d51c59d.7acffa"\r
+                "1912a08f.2e751f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7a3de29.b44a1",\r
+        "id": "74698dba.4a5d9c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1071,\r
-        "y": 604,\r
+        "x": 1079,\r
+        "y": 602.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "9c15e41a.6cfbc8"\r
+                "3d4b777c.0e42f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d51c59d.7acffa",\r
+        "id": "1912a08f.2e751f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1227,\r
-        "y": 502,\r
+        "x": 1235,\r
+        "y": 500.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e55192de.2cc998",\r
+        "id": "8794be9f.289a08",\r
         "type": "record",\r
         "name": "log file",\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": 891,\r
-        "y": 339,\r
+        "x": 899,\r
+        "y": 337.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84bf875e.b8d51",\r
+        "id": "3564e5a8.68c49a",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1101,\r
-        "y": 181,\r
+        "x": 1109,\r
+        "y": 179.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "5889c4ed.3fc544"\r
+                "d6240165.9d9a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc6df2e.2398e9",\r
+        "id": "fd68b5a4.a3a878",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106,\r
-        "y": 256,\r
+        "x": 1114,\r
+        "y": 254.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "5889c4ed.3fc544"\r
+                "d6240165.9d9a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a21fbfb7.b6608",\r
+        "id": "f51e137e.4b4cd",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1082,\r
-        "y": 550,\r
+        "x": 1090,\r
+        "y": 548.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "3d51c59d.7acffa"\r
+                "1912a08f.2e751f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1ffb2f2.4b50b8",\r
+        "id": "1b6896a8.e62c19",\r
         "type": "set",\r
         "name": "unset node",\r
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",\r
         "comments": "",\r
-        "x": 899,\r
-        "y": 68,\r
+        "x": 907,\r
+        "y": 66.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9abbad80.6c0f7",\r
+        "id": "64896027.57fb78",\r
         "type": "set",\r
         "name": "unset termination point",\r
         "xml": "<set>\n<parameter name='tp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1561,\r
-        "y": 500,\r
+        "x": 1569,\r
+        "y": 498.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1bd07bf.99e9784",\r
+        "id": "7da29c03.1dbdf4",\r
         "type": "set",\r
         "name": "unset tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1676,\r
-        "y": 191,\r
+        "x": 1684,\r
+        "y": 189.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d32d079.32cfb8",\r
+        "id": "486bef2.804149",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2081,\r
-        "y": 426,\r
+        "x": 2089,\r
+        "y": 424.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "42b15971.2191b8"\r
+                "f859267c.20dd3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c2d8774.9a9178",\r
+        "id": "8297f8e3.32f2f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2078,\r
-        "y": 474,\r
+        "x": 2086,\r
+        "y": 472.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "ad595c83.2160d"\r
+                "19a686f.52c17f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42b15971.2191b8",\r
+        "id": "f859267c.20dd3",\r
         "type": "record",\r
         "name": "log file",\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": 2236,\r
-        "y": 427,\r
+        "x": 2244,\r
+        "y": 425.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ad595c83.2160d",\r
+        "id": "19a686f.52c17f9",\r
         "type": "record",\r
         "name": "log file",\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": 2237,\r
-        "y": 475,\r
+        "x": 2245,\r
+        "y": 473.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b9a378e9.3ee13",\r
+        "id": "c991cb25.a4c41",\r
         "type": "execute",\r
         "name": "execute Base64 Converter",\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": 2027,\r
-        "y": 669,\r
+        "x": 2035,\r
+        "y": 667.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "1cdf8713.954a51",\r
-                "3754d4b.0357eac"\r
+                "dcbfdbac.4106e8",\r
+                "25f66573.5f2caa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef702ba5.ac71e",\r
+        "id": "fe275075.949f1",\r
         "type": "switchNode",\r
         "name": "switch inter-domain-plug-id empty?",\r
         "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1597,\r
-        "y": 670,\r
+        "x": 1605,\r
+        "y": 668.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "95523b36.e61fe",\r
-                "a2f27028.9e578"\r
+                "2202ef19.0cb66",\r
+                "a44d5e08.8645a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2f27028.9e578",\r
+        "id": "a44d5e08.8645a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1824,\r
-        "y": 623,\r
+        "x": 1832,\r
+        "y": 621.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "ce508a28.fe217"\r
+                "77ac957f.8f7e64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95523b36.e61fe",\r
+        "id": "2202ef19.0cb66",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1825,\r
-        "y": 669,\r
+        "x": 1833,\r
+        "y": 667.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "b9a378e9.3ee13"\r
+                "c991cb25.a4c41"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce508a28.fe217",\r
+        "id": "77ac957f.8f7e64",\r
         "type": "set",\r
         "name": "unset tmp.decoded-plug-id",\r
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",\r
         "comments": "",\r
-        "x": 2028,\r
-        "y": 623,\r
+        "x": 2036,\r
+        "y": 621.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cdf8713.954a51",\r
+        "id": "dcbfdbac.4106e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2232,\r
-        "y": 646,\r
+        "x": 2240,\r
+        "y": 644.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "611d993d.82c5c"\r
+                "21836a86.63b72e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3754d4b.0357eac",\r
+        "id": "25f66573.5f2caa",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2225.6785888671875,\r
-        "y": 698.2143115997314,\r
+        "x": 2233.6785888671875,\r
+        "y": 696.2208118438721,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             [\r
-                "495bfe4.4b1a"\r
+                "8297f536.6bb4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "611d993d.82c5c",\r
+        "id": "21836a86.63b72e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2373,\r
-        "y": 646,\r
+        "x": 2381,\r
+        "y": 644.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "495bfe4.4b1a",\r
+        "id": "8297f536.6bb4a",\r
         "type": "set",\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": 2432,\r
-        "y": 698,\r
+        "x": 2440,\r
+        "y": 696.0065002441406,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7667eb6.ec8938",\r
+        "id": "1c1d34a0.adaa8b",\r
         "type": "set",\r
         "name": "set tmp.network-if",\r
         "xml": "<set>\n<parameter name='tmp.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 667,\r
-        "y": 83,\r
+        "x": 675,\r
+        "y": 81.00650024414062,\r
         "z": "6d6b8a1f.be1cb4",\r
         "wires": []\r
     }\r

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
index 1ef85f5..a47bab0 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "db76d876.619d4",\r
+        "id": "f3e0b928.e8c7e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 107,\r
-        "y": 76,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 128,\r
+        "y": 83,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "ac7d0d8e.d68168"\r
+                "2b8024f5.a0b3e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac7d0d8e.d68168",\r
+        "id": "2b8024f5.a0b3e4",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\r
@@ -22,504 +22,540 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 196.00003051757812,\r
-        "y": 166.88891220092773,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 217.00003051757812,\r
+        "y": 173.88891220092773,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "15add1ed.67bb06"\r
+                "e0b4218d.2d604"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15add1ed.67bb06",\r
+        "id": "e0b4218d.2d604",\r
         "type": "method",\r
         "name": "method update-tp-ttp-relationship",\r
         "xml": "<method rpc='update-tp-ttp-relationship' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 232.1112518310547,\r
-        "y": 237.22223663330078,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 253.1112518310547,\r
+        "y": 244.22223663330078,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "2ef3d64c.d8633a"\r
+                "36afdba8.70bb5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ef3d64c.d8633a",\r
+        "id": "36afdba8.70bb5c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 457.33343505859375,\r
-        "y": 236.77792358398438,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 478.33343505859375,\r
+        "y": 243.77792358398438,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "929780.1985e88",\r
-                "25858afe.2b9bce",\r
-                "e912429a.04b788"\r
+                "63bd9611.390fd8",\r
+                "1ed8c21a.583ede",\r
+                "232a5f0a.159568",\r
+                "e63ab049.15d1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25858afe.2b9bce",\r
+        "id": "1ed8c21a.583ede",\r
         "type": "for",\r
         "name": "for each node in network-eth",\r
         "xml": "<for index='pethidx' start='0' end='`$network-eth.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 689.8888549804688,\r
-        "y": 191.33331298828125,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 710.8888549804688,\r
+        "y": 198.33331298828125,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "9ceedf0.da974a",\r
-                "2a93e407.ae18bc",\r
-                "e6e033d7.96653"\r
+                "d25c4b67.5fdd7",\r
+                "7e336092.2a08",\r
+                "d912c615.382f4",\r
+                "e1c780a1.bce018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ceedf0.da974a",\r
+        "id": "d25c4b67.5fdd7",\r
         "type": "set",\r
         "name": "set node-eth",\r
         "xml": "<set>\n<parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />",\r
         "comments": "",\r
         "x": 973.111083984375,\r
-        "y": 98.22221374511719,\r
-        "z": "ffd702ea.3cd72",\r
+        "y": 42.22221374511719,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "79b02bc6.8ef74c",\r
+        "id": "68049.3760dfb7c",\r
         "type": "set",\r
         "name": "set termination point tp-eth",\r
         "xml": "<set>\n<parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 1194.111328125,\r
-        "y": 225.00006103515625,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1215.111328125,\r
+        "y": 232.00006103515625,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "53e75306.b60214",\r
+        "id": "78ae2560.1cea4c",\r
         "type": "set",\r
         "name": "set unique-ltpethId",\r
         "xml": "<set>\n<parameter name='unique-ltpethId' value=\"`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1172.000244140625,\r
-        "y": 262.111083984375,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1193.000244140625,\r
+        "y": 269.111083984375,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "929780.1985e88",\r
+        "id": "63bd9611.390fd8",\r
         "type": "execute",\r
         "name": "execute set tmp.network-eth.network-id",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-eth.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-eth.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 647.9935302734375,\r
-        "y": 55.993499755859375,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 668.9935302734375,\r
+        "y": 62.993499755859375,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2a93e407.ae18bc",\r
+        "id": "7e336092.2a08",\r
         "type": "set",\r
         "name": "set local variables",\r
-        "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\n",\r
         "comments": "",\r
-        "x": 972,\r
-        "y": 146,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 987,\r
+        "y": 97,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e912429a.04b788",\r
+        "id": "232a5f0a.159568",\r
         "type": "execute",\r
         "name": "execute set tmp.network-otn.network-id",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network-otn.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.original-network-otn.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 645,\r
-        "y": 95,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 666,\r
+        "y": 102,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8be3e429.ccb7d",\r
+        "id": "5ced7489.3fd33c",\r
         "type": "for",\r
         "name": "for each tunnel termination point in otn",\r
         "xml": "<for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1549,\r
-        "y": 622,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1570,\r
+        "y": 629,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "f3d35e68.c9d718",\r
-                "3ad809f1.06ba16",\r
-                "4db37c69.2430a4",\r
-                "ec80108a.70e1d",\r
-                "6c3aac2e.471db4"\r
+                "c149dbcd.dbc5b",\r
+                "a007e2e5.f8d76",\r
+                "1e876a82.9683f5",\r
+                "a5938665.3779c8",\r
+                "a06a50c9.82a2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3d35e68.c9d718",\r
+        "id": "c149dbcd.dbc5b",\r
         "type": "set",\r
         "name": "set tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />\n",\r
         "comments": "",\r
-        "x": 1918,\r
-        "y": 334,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1939,\r
+        "y": 341,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ad809f1.06ba16",\r
+        "id": "a007e2e5.f8d76",\r
         "type": "set",\r
         "name": "set unique-ttpId",\r
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 1885.888916015625,\r
-        "y": 398.111083984375,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1906.888916015625,\r
+        "y": 405.111083984375,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c6c9bf4.1268f4",\r
+        "id": "b56a229e.94c8d8",\r
         "type": "set",\r
         "name": "set tp-inter-layer-lock-id",\r
         "xml": "<set>\n<parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />\n",\r
         "comments": "",\r
-        "x": 1212,\r
-        "y": 302,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1233,\r
+        "y": 309,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38915841.38d1e",\r
+        "id": "91b08f38.b7b1f",\r
         "type": "for",\r
         "name": "for each node in network-otn",\r
         "xml": "<for index='potnidx' start='0' end='`$network-otn.node_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1230,\r
-        "y": 351,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1251,\r
+        "y": 358,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "b1b6d531.8e8428",\r
-                "591e31d0.de7628",\r
-                "e2cb35d4.99da",\r
-                "32e4e342.a9f04c"\r
+                "2a04c22a.d38706",\r
+                "747557f8.e08f6",\r
+                "23d7e732.31c878",\r
+                "7fec5669.9d797",\r
+                "5525a122.db022"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1b6d531.8e8428",\r
+        "id": "2a04c22a.d38706",\r
         "type": "set",\r
         "name": "set node-otn",\r
         "xml": "<set>\n<parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />",\r
         "comments": "",\r
-        "x": 1524,\r
-        "y": 321,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1545,\r
+        "y": 328,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "591e31d0.de7628",\r
+        "id": "747557f8.e08f6",\r
         "type": "set",\r
         "name": "set local variables",\r
-        "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\n",\r
         "comments": "",\r
-        "x": 1522.888916015625,\r
-        "y": 368.7777862548828,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1543.888916015625,\r
+        "y": 375.7777862548828,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4db37c69.2430a4",\r
+        "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
         "comments": "",\r
-        "x": 1910,\r
-        "y": 452,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1931,\r
+        "y": 459,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec80108a.70e1d",\r
+        "id": "a5938665.3779c8",\r
         "type": "switchNode",\r
         "name": "switch tp-inter-layer-lock-id",\r
         "xml": "<switch test='`$tp-inter-layer-lock-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1917,\r
-        "y": 508,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1938,\r
+        "y": 515,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "cf4f4a72.7d5168"\r
+                "48b284bc.31f88c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf4f4a72.7d5168",\r
+        "id": "48b284bc.31f88c",\r
         "type": "outcome",\r
         "name": "ttp-inter-layer-lock-id",\r
         "xml": "<outcome value='`$ttp-inter-layer-lock-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1975,\r
-        "y": 604,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1996,\r
+        "y": 611,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "3d7797fd.32b9a8"\r
+                "d5168225.118b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d7797fd.32b9a8",\r
+        "id": "d5168225.118b5",\r
         "type": "save",\r
         "name": "save p-interface relationship to ttp in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='p-interface.interface-name = $unique-ltpethId' 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[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.tunnel-tp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2293,\r
-        "y": 604,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 2314,\r
+        "y": 611,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8fd2648.6f854",\r
+        "id": "679b8e41.9ed698",\r
         "type": "set",\r
         "name": "unset termination point tp-eth",\r
         "xml": "<set>\n<parameter name='tp-eth.' value='' />\n",\r
         "comments": "",\r
-        "x": 1189,\r
-        "y": 187.99349975585938,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1210,\r
+        "y": 194.99349975585938,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c3aac2e.471db4",\r
+        "id": "a06a50c9.82a2f",\r
         "type": "set",\r
         "name": "unset tunnel termination point",\r
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",\r
         "comments": "",\r
-        "x": 1926,\r
-        "y": 280.9934997558594,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1947,\r
+        "y": 287.9934997558594,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6e033d7.96653",\r
+        "id": "d912c615.382f4",\r
         "type": "switchNode",\r
         "name": "switch node-eth tp",\r
         "xml": "<switch test='`$node-eth.termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 556,\r
-        "y": 370,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 577,\r
+        "y": 377,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "80e4765d.fcdaa8",\r
-                "a8cca188.f375d",\r
-                "b96aa4a5.384fe8"\r
+                "a5220607.a1fd88",\r
+                "ed33421.4d77fc",\r
+                "60e52ea8.adce88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80e4765d.fcdaa8",\r
+        "id": "a5220607.a1fd88",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 735,\r
-        "y": 322,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 756,\r
+        "y": 329,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "adea3129.2af79"\r
+                "f8847f3a.3586c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adea3129.2af79",\r
+        "id": "f8847f3a.3586c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 890,\r
-        "y": 322,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 911,\r
+        "y": 329,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b96aa4a5.384fe8",\r
+        "id": "60e52ea8.adce88",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 745,\r
-        "y": 370,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 766,\r
+        "y": 377,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "adea3129.2af79"\r
+                "f8847f3a.3586c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8cca188.f375d",\r
+        "id": "ed33421.4d77fc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734,\r
-        "y": 424,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 755,\r
+        "y": 431,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "2c29c804.a15ee"\r
+                "4137593c.5397c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c29c804.a15ee",\r
+        "id": "4137593c.5397c",\r
         "type": "for",\r
         "name": "for each termination point",\r
         "xml": "<for index='tidx' start='0' end='`$node-eth.termination-point_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 942.4444580078125,\r
-        "y": 394.111083984375,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 963.4444580078125,\r
+        "y": 401.111083984375,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "b8fd2648.6f854",\r
-                "79b02bc6.8ef74c",\r
-                "53e75306.b60214",\r
-                "7c6c9bf4.1268f4",\r
-                "38915841.38d1e"\r
+                "679b8e41.9ed698",\r
+                "68049.3760dfb7c",\r
+                "78ae2560.1cea4c",\r
+                "b56a229e.94c8d8",\r
+                "91b08f38.b7b1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2cb35d4.99da",\r
+        "id": "23d7e732.31c878",\r
         "type": "set",\r
         "name": "unset node-otn",\r
         "xml": "<set>\n<parameter name='node-otn.' value='' />\n<parameter name='unique-network-otnId' value='' />\n<parameter name='unique-node-otnId' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 1525,\r
-        "y": 270,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1546,\r
+        "y": 277,\r
+        "z": "8966128c.40fc9",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32e4e342.a9f04c",\r
+        "id": "7fec5669.9d797",\r
         "type": "switchNode",\r
         "name": "switch node-otn ttp",\r
         "xml": "<switch test='`$node-otn.te.tunnel-termination-point_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1122,\r
-        "y": 601,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1143,\r
+        "y": 608,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "571c7e22.88577",\r
-                "c4c843ca.dc868",\r
-                "dcc7ee12.1af12"\r
+                "c2495d37.4f1a88",\r
+                "4a7d6e3.4a2c99",\r
+                "e5a8fd10.f52c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "571c7e22.88577",\r
+        "id": "c2495d37.4f1a88",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1310,\r
-        "y": 487,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1331,\r
+        "y": 494,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "3d4d0383.b594e4"\r
+                "50aa44cc.08445c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4c843ca.dc868",\r
+        "id": "4a7d6e3.4a2c99",\r
         "type": "outcome",\r
         "name": "length 0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1315,\r
-        "y": 562,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1336,\r
+        "y": 569,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "3d4d0383.b594e4"\r
+                "50aa44cc.08445c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcc7ee12.1af12",\r
+        "id": "e5a8fd10.f52c58",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1312,\r
-        "y": 624,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1333,\r
+        "y": 631,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             [\r
-                "8be3e429.ccb7d"\r
+                "5ced7489.3fd33c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d4d0383.b594e4",\r
+        "id": "50aa44cc.08445c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1470,\r
-        "y": 553,\r
-        "z": "ffd702ea.3cd72",\r
+        "x": 1491,\r
+        "y": 560,\r
+        "z": "8966128c.40fc9",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "e1c780a1.bce018",\r
+        "type": "set",\r
+        "name": "set local variables",\r
+        "xml": "<set>\n<parameter name='unique-node-ethId' value=\"`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 989,\r
+        "y": 153,\r
+        "z": "8966128c.40fc9",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e63ab049.15d1f",\r
+        "type": "set",\r
+        "name": "set local variables",\r
+        "xml": "<set>\n<parameter name='tmp.network-eth.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`\" />\n<parameter name='tmp.network-otn.network-id' value=\"`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 658,\r
+        "y": 144,\r
+        "z": "8966128c.40fc9",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5525a122.db022",\r
+        "type": "set",\r
+        "name": "set local variables",\r
+        "xml": "<set>\n<parameter name='unique-node-otnId' value=\"`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 1544,\r
+        "y": 425,\r
+        "z": "8966128c.40fc9",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index ab50abd..f870e36 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,271 +1,287 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
-    <method rpc="update-network-links-to-aai" mode="sync">\r
+<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-links-to-aai' mode='sync'>\r
         <block atomic="true">\r
-            <for index="pidx" start="0" end="`$network.link_length`">\r
+            <for index='pidx' start='0' end='`$network.link_length`' >\r
                 <set>\r
-                    <parameter name="link." value=""/>\r
-                    <parameter name="dst-tpId" value=""/>\r
-                    <parameter name="unique-dst-node-Id" value=""/>\r
-                    <parameter name="is-open-ended-link" value="false"/>\r
-                    <parameter name="is-invalid-open-ended-link" value="false"/>\r
+                    <parameter name='link.' value='' />\r
+                    <parameter name='dst-tpId' value='' />\r
+                    <parameter name='unique-dst-node-Id' value='' />\r
+                    <parameter name='is-open-ended-link' value='false' />\r
+                    <parameter name='is-invalid-open-ended-link' value='false' />\r
                 </set>\r
                 <set>\r
-                    <parameter name="link." value="`$network.link[$pidx].`"/>\r
-                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
+                    <parameter name='link.' value='`$network.link[$pidx].`' />\r
+                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
                 </set>\r
                 <set>\r
-                    <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>\r
-                    <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>\r
-                    <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>\r
+                    <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />\r
+                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />\r
+                    <parameter name='unique-src-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`" />\r
                 </set>\r
-                <switch test="`$link.destination.dest-node`">\r
-                    <outcome value="">\r
+                <switch test='`$link.destination.dest-node`'>\r
+                    <outcome value=''>\r
                         <block>\r
                             <set>\r
-                                <parameter name="is-open-ended-link" value="true"/>\r
+                                <parameter name='is-open-ended-link' value='true' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="tmp.aai.p-interface" value=""/>\r
-                                <parameter name="tmp.aai.p-interface.inter-domain-plug-id" value=""/>\r
+                                <parameter name='tmp.aai.p-interface' value='' />\r
+                                <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />\r
                             </set>\r
-                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">\r
-                                <outcome value="success">\r
-                                    <switch test="`$tmp.aai.p-interface.inter-domain-plug-id`">\r
-                                        <outcome value="">\r
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="p-interface"\r
+           key="pnf.pnf-name = $unique-src-node-Id\r
+               and p-interface.interface-name = $src-tpId"\r
+               local-only="false" \r
+               pfx="tmp.aai.p-interface" >\r
+                                <outcome value='success'>\r
+                                    <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>\r
+                                        <outcome value=''>\r
                                             <set>\r
-                                                <parameter name="is-open-ended-link" value="false"/>\r
-                                                <parameter name="is-invalid-open-ended-link" value="true"/>\r
+                                                <parameter name='is-open-ended-link' value='false' />\r
+                                                <parameter name='is-invalid-open-ended-link' value='true' />\r
                                             </set>\r
                                         </outcome>\r
-                                        <outcome value="Other">\r
+                                        <outcome value='Other'>\r
                                             <set>\r
-                                                <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>\r
-                                                <!--\r
-                                                <parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />\r
-                                                -->\r
+                                                <parameter name='alt-unique-linkId' value="`$tmp.aai.p-interface.inter-domain-plug-id`" />\r
+                                                <!--<parameter name='alt-unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $tmp.aai.p-interface.inter-domain-plug-id`" />-->\r
                                             </set>\r
                                         </outcome>\r
                                     </switch>\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.l3vpn.pe1_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.l3vpn.pe1_id`" />\r
                                     </return>\r
                                 </outcome>\r
-                                <outcome value="failure">\r
-                                    <return status="failure">\r
-                                        <parameter name="error-code" value=""/>\r
-                                        <parameter name="error-message" value=""/>\r
+                                <outcome value='failure'>\r
+                                    <return status='failure'>\r
+                                        <parameter name='error-code' value='' />\r
+                                        <parameter name='error-message' value='' />\r
                                     </return>\r
                                 </outcome>\r
                             </get-resource>\r
                         </block>\r
                     </outcome>\r
-                    <outcome value="Other">\r
+                    <outcome value='Other'>\r
                         <set>\r
-                            <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>\r
-                            <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>\r
-                            <parameter name="is-open-ended-link" value="false"/>\r
+                            <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />\r
+                            <parameter name='unique-dst-node-Id' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`" />\r
+                            <parameter name='is-open-ended-link' value='false' />\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
-                <switch test="`$is-invalid-open-ended-link`">\r
-                    <outcome value="true">\r
-                        <block/>\r
+                <switch test='`$is-invalid-open-ended-link`'>\r
+                    <outcome value='true'>\r
+                        <block></block>\r
                     </outcome>\r
-                    <outcome value="false">\r
-                        <switch test="`$is-open-ended-link`">\r
-                            <outcome value="true">\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">\r
-                                    <outcome value="success">\r
+                    <outcome value='false'>\r
+                        <switch test='`$is-open-ended-link`'>\r
+                            <outcome value='true'>\r
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="logical-link"\r
+           key="logical-link.link-name = $alt-unique-linkId"\r
+               local-only="false" \r
+               pfx="tmp.aai.logical-link" >\r
+                                    <outcome value='success'>\r
                                         <block>\r
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                <parameter name="file" value="/opt/onap/logMerge.txt"/>\r
-                                                <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                <parameter name="field2" value="altUniqueLinkId"/>\r
-                                                <parameter name="field3" value="`$alt-unique-linkId`"/>\r
-                                                <parameter name="field4" value="srcTpId"/>\r
-                                                <parameter name="field5" value="`$src-tpId`"/>\r
-                                                <parameter name="field6" value="relationship-value"/>\r
-                                                <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
+                                                <parameter name="file" value="/opt/onap/logMerge.txt" />\r
+                                                <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                <parameter name="field2" value="altUniqueLinkId" />\r
+                                                <parameter name="field3" value="`$alt-unique-linkId`" />\r
+                                                <parameter name="field4" value="srcTpId" />\r
+                                                <parameter name="field5" value="`$src-tpId`" />\r
+                                                <parameter name="field6" value="relationship-value" />\r
+                                                <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
                                             </record>\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">\r
-                                                <!--\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
+      key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->\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="`$src-tpId`" />-->\r
                                                 <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />\r
-                                                -->\r
-                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\r
-                                                -->\r
-                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
-                                                -->\r
-                                                <!--\r
                                                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />\r
-                                                -->\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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\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="`$src-tpId`"/>\r
-                                                <outcome value="success">\r
+                                                <outcome value='success'>\r
                                                     <block>\r
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                            <parameter name="file" value="/opt/onap/logMergeSuccess.txt"/>\r
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                            <parameter name="field2" value="altUniqueLinkId"/>\r
-                                                            <parameter name="field3" value="`$alt-unique-linkId`"/>\r
-                                                            <parameter name="field4" value="srcTpId"/>\r
-                                                            <parameter name="field5" value="`$src-tpId`"/>\r
-                                                            <parameter name="field6" value="relationship-value"/>\r
-                                                            <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
+                                                            <parameter name="file" value="/opt/onap/logMergeSuccess.txt" />\r
+                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                            <parameter name="field2" value="altUniqueLinkId" />\r
+                                                            <parameter name="field3" value="`$alt-unique-linkId`" />\r
+                                                            <parameter name="field4" value="srcTpId" />\r
+                                                            <parameter name="field5" value="`$src-tpId`" />\r
+                                                            <parameter name="field6" value="relationship-value" />\r
+                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
                                                         </record>\r
                                                     </block>\r
                                                 </outcome>\r
-                                                <outcome value="failure">\r
+                                                <outcome value='failure'>\r
                                                     <block>\r
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                            <parameter name="file" value="/opt/onap/logMergeFailure.txt"/>\r
-                                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                            <parameter name="field2" value="altUniqueLinkId"/>\r
-                                                            <parameter name="field3" value="`$alt-unique-linkId`"/>\r
-                                                            <parameter name="field4" value="srcTpId"/>\r
-                                                            <parameter name="field5" value="`$src-tpId`"/>\r
-                                                            <parameter name="field6" value="relationship-value"/>\r
-                                                            <parameter name="field7" value="`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`"/>\r
+                                                            <parameter name="file" value="/opt/onap/logMergeFailure.txt" />\r
+                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                            <parameter name="field2" value="altUniqueLinkId" />\r
+                                                            <parameter name="field3" value="`$alt-unique-linkId`" />\r
+                                                            <parameter name="field4" value="srcTpId" />\r
+                                                            <parameter name="field5" value="`$src-tpId`" />\r
+                                                            <parameter name="field6" value="relationship-value" />\r
+                                                            <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />\r
                                                         </record>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </save>\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
-                                                <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
-                                                <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                                <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                                <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
                                             </save>\r
-                                            <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
-                                                <outcome value="">\r
-                                                    <block/>\r
+                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
+                                                <outcome value=''>\r
+                                                    <block></block>\r
                                                 </outcome>\r
-                                                <outcome value="0">\r
-                                                    <block/>\r
+                                                <outcome value='0'>\r
+                                                    <block></block>\r
                                                 </outcome>\r
-                                                <outcome value="Other">\r
-                                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                <outcome value='Other'>\r
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
                                                         <set>\r
-                                                            <parameter name="label-restriction." value=""/>\r
-                                                            <parameter name="unique-lrId" value=""/>\r
+                                                            <parameter name='label-restriction.' value='' />\r
+                                                            <parameter name='unique-lrId' value="" />\r
                                                         </set>\r
                                                         <set>\r
-                                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
                                                         </set>\r
                                                         <set>\r
-                                                            <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
+                                                            <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />\r
                                                         </set>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
-                                                            <parameter name="id" value="`$unique-lrId`"/>\r
-                                                            <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
-                                                            <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
-                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
-                                                            <outcome value="success">\r
-                                                                <block/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                            <parameter name='id' value='`$unique-lrId`' />\r
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
+                                                            <outcome value='success'>\r
+                                                                <block></block>\r
                                                             </outcome>\r
-                                                            <outcome value="failure">\r
-                                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
-                                                                    <parameter name="id" value="`$unique-lrId`"/>\r
-                                                                    <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
-                                                                    <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
-                                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                            <outcome value='failure'>\r
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                                    <parameter name='id' value='`$unique-lrId`' />\r
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
                                                                 </save>\r
                                                             </outcome>\r
                                                         </save>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
-                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />\r
                                                         </save>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
-                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
                                                         </save>\r
                                                     </for>\r
                                                 </outcome>\r
                                             </switch>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value="not-found">\r
-                                        <block atomic="true">\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">\r
-                                                <parameter name="link-name" value="`$alt-unique-linkId`"/>\r
-                                                <parameter name="link-id" value="`$link.link-id`"/>\r
-                                                <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                                    <outcome value='not-found'>\r
+                                        <block atomic='true'>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \r
+      key='logical-link.link-name = $alt-unique-linkId' >\r
+                                                <parameter name='link-name' value='`$alt-unique-linkId`' />\r
+                                                <parameter name='link-id' value='`$link.link-id`' />\r
+                                                <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                                <parameter name='link-role' value='cross-domain' />\r
                                             </save>\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\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="`$src-tpId`"/>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
+      key='logical-link.link-name = $alt-unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\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="`$src-tpId`" />\r
                                             </save>\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
-                                                <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
-                                                <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                                <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                                <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
                                             </save>\r
-                                            <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
-                                                <outcome value="">\r
-                                                    <block/>\r
+                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
+                                                <outcome value=''>\r
+                                                    <block></block>\r
                                                 </outcome>\r
-                                                <outcome value="0">\r
-                                                    <block/>\r
+                                                <outcome value='0'>\r
+                                                    <block></block>\r
                                                 </outcome>\r
-                                                <outcome value="Other">\r
-                                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                                <outcome value='Other'>\r
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
                                                         <set>\r
-                                                            <parameter name="label-restriction." value=""/>\r
-                                                            <parameter name="unique-lrId" value=""/>\r
+                                                            <parameter name='label-restriction.' value='' />\r
+                                                            <parameter name='unique-lrId' value="" />\r
                                                         </set>\r
                                                         <set>\r
-                                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
                                                         </set>\r
                                                         <set>\r
-                                                            <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
+                                                            <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />\r
                                                         </set>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
-                                                            <parameter name="id" value="`$unique-lrId`"/>\r
-                                                            <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
-                                                            <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
-                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
-                                                            <outcome value="success">\r
-                                                                <block/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                            <parameter name='id' value='`$unique-lrId`' />\r
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
+                                                            <outcome value='success'>\r
+                                                                <block></block>\r
                                                             </outcome>\r
-                                                            <outcome value="failure">\r
-                                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">\r
-                                                                    <parameter name="id" value="`$unique-lrId`"/>\r
-                                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>\r
-                                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>\r
-                                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                            <outcome value='failure'>\r
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='logical-link.link-name = $alt-unique-linkId\r
+      AND label-restriction.id = $unique-lrId' >\r
+                                                                    <parameter name='id' value='`$unique-lrId`' />\r
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />\r
+                                                                    <parameter name='label-end' value='`$label-restriction.label-end`' />\r
+                                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
                                                                 </save>\r
                                                             </outcome>\r
                                                         </save>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
-                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`"/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />\r
                                                         </save>\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
-                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
-                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
                                                         </save>\r
                                                     </for>\r
                                                 </outcome>\r
@@ -274,88 +290,96 @@
                                     </outcome>\r
                                 </get-resource>\r
                             </outcome>\r
-                            <outcome value="false">\r
-                                <block atomic="true">\r
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">\r
-                                        <parameter name="link-name" value="`$unique-linkId`"/>\r
-                                        <parameter name="link-id" value="`$link.link-id`"/>\r
-                                        <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                            <outcome value='false'>\r
+                                <block atomic='true'>\r
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \r
+      key='logical-link.link-name = $unique-linkId' >\r
+                                        <parameter name='link-name' value='`$unique-linkId`' />\r
+                                        <parameter name='link-id' value='`$link.link-id`' />\r
+                                        <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\r
                                     </save>\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="uniqueLinkId"/>\r
-                                        <parameter name="field3" value="`$unique-linkId`"/>\r
-                                        <parameter name="field4" value="srcTpId"/>\r
-                                        <parameter name="field5" value="`$src-tpId`"/>\r
-                                        <parameter name="field6" value="dstTpId"/>\r
-                                        <parameter name="field7" value="`$dst-tpId`"/>\r
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />\r
+                                        <parameter name="field1" value="__TIMESTAMP__" />\r
+                                        <parameter name="field2" value="uniqueLinkId" />\r
+                                        <parameter name="field3" value="`$unique-linkId`" />\r
+                                        <parameter name="field4" value="srcTpId" />\r
+                                        <parameter name="field5" value="`$src-tpId`" />\r
+                                        <parameter name="field6" value="dstTpId" />\r
+                                        <parameter name="field7" value="`$dst-tpId`" />\r
                                     </record>\r
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>\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="`$src-tpId`"/>\r
-                                        <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>\r
-                                        <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>\r
-                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>\r
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
+      key='logical-link.link-name = $unique-linkId' 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-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />\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="`$src-tpId`" />\r
+                                        <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />\r
+                                        <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`" />\r
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
+                                        <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />\r
                                     </save>\r
-                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute" key="te-link-attribute.id = $link.te.te-link-attributes.name">\r
-                                        <parameter name="id" value="`$link.te.te-link-attributes.name`"/>\r
-                                        <parameter name="access-type" value="`$link.te.te-link-attributes.access-type`"/>\r
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                        <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                        <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
                                     </save>\r
-                                    <switch test="`$link.te.te-link-attributes.label-restriction_length`">\r
-                                        <outcome value="">\r
-                                            <block/>\r
+                                    <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
+                                        <outcome value=''>\r
+                                            <block></block>\r
                                         </outcome>\r
-                                        <outcome value="0">\r
-                                            <block/>\r
+                                        <outcome value='0'>\r
+                                            <block></block>\r
                                         </outcome>\r
-                                        <outcome value="Other">\r
-                                            <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">\r
+                                        <outcome value='Other'>\r
+                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
                                                 <set>\r
-                                                    <parameter name="label-restriction." value=""/>\r
-                                                    <parameter name="unique-lrId" value=""/>\r
+                                                    <parameter name='label-restriction.' value='' />\r
+                                                    <parameter name='unique-lrId' value="" />\r
                                                 </set>\r
                                                 <set>\r
-                                                    <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>\r
+                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
                                                 </set>\r
                                                 <set>\r
-                                                    <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>\r
+                                                    <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />\r
                                                 </set>\r
-                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="label-restriction.id = $unique-lrId">\r
-                                                    <parameter name="id" value="`$unique-lrId`"/>\r
-                                                    <parameter name="label-start" value="`$label-restriction.label-start.te-label-tpn`"/>\r
-                                                    <parameter name="label-end" value="`$label-restriction.label-end.te-label-tpn`"/>\r
-                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
-                                                    <outcome value="success">\r
-                                                        <block/>\r
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                    <parameter name='id' value='`$unique-lrId`' />\r
+                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
+                                                    <outcome value='success'>\r
+                                                        <block></block>\r
                                                     </outcome>\r
-                                                    <outcome value="failure">\r
-                                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">\r
-                                                            <parameter name="id" value="`$unique-lrId`"/>\r
-                                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>\r
-                                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>\r
-                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>\r
-                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>\r
-                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>\r
+                                                    <outcome value='failure'>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='logical-link.link-name = $unique-linkId\r
+      AND label-restriction.id = $unique-lrId' >\r
+                                                            <parameter name='id' value='`$unique-lrId`' />\r
+                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />\r
+                                                            <parameter name='label-end' value='`$label-restriction.label-end`' />\r
+                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
                                                         </save>\r
                                                     </outcome>\r
                                                 </save>\r
-                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                    <parameter name="relationship-list.relationship[0].related-to" value="logical-link"/>\r
-                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`"/>\r
-                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name"/>\r
-                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`"/>\r
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`" />\r
                                                 </save>\r
-                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="te-link-attribute:relationship-list" key="te-link-attribute.id = $link.te.te-link-attributes.name" force="true" pfx="tmp.AnAI-data">\r
-                                                    <parameter name="relationship-list.relationship[0].related-to" value="label-restriction"/>\r
-                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>\r
-                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id"/>\r
-                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`"/>\r
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
                                                 </save>\r
                                             </for>\r
                                         </outcome>\r

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 839e15d..5a0255d 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,113 +1,118 @@
-<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
+<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
         <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" 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'  \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>\r
-            <for index="pidx" start="0" end="`$network.node_length`">\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" 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' \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>\r
-                <switch test="`$node.te.tunnel-termination-point_length`">\r
-                    <outcome value="">\r
-                        <block/>\r
+                <switch test='`$node.te.tunnel-termination-point_length`'>\r
+                    <outcome value=''>\r
+                        <block></block>\r
                     </outcome>\r
-                    <outcome value="0">\r
-                        <block/>\r
+                    <outcome value='0'>\r
+                        <block></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='ttidx' start='0' end='`$node.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.te.tunnel-termination-point[$ttidx].`"/>\r
+                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
+                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />\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`"/>\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
+                            <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
                                 </outcome>\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`"/>\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='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>\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[$ttidx].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[$ttidx].related-link`" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
-                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-key`" value="tunnel-termination-point.ttp-id"/>\r
-                                <parameter name="`relationship-list.relationship[$ttidx].relationship-data[0].relationship-value`" value="`$unique-ttpId`"/>\r
-                                <outcome value="success">\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
+                                        <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
+                                <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
+                                        <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
@@ -115,91 +120,94 @@
                     </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
+                    <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" 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' \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>\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 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>\r
-                <switch test="`$node.termination-point_length`">\r
-                    <outcome value="">\r
-                        <block/>\r
+                <switch test='`$node.termination-point_length`'>\r
+                    <outcome value=''>\r
+                        <block></block>\r
                     </outcome>\r
-                    <outcome value="0">\r
-                        <block/>\r
+                    <outcome value='0'>\r
+                        <block></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='tidx' start='0' end='`$node.termination-point_length`' >\r
                             <set>\r
-                                <parameter name="tp." value=""/>\r
+                                <parameter name='tp.' value='' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>\r
+                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />\r
                             </set>\r
                             <set>\r
-                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>\r
+                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />\r
                             </set>\r
-                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">\r
-                                <outcome value="true">\r
+                            <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
+                                        <parameter name='tmp.decoded-plug-id' value='' />\r
                                     </set>\r
                                 </outcome>\r
-                                <outcome value="false">\r
-                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">\r
-                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                <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 value='success'>\r
+                                            <block></block>\r
                                         </outcome>\r
-                                        <outcome value="failure">\r
+                                        <outcome value='failure'>\r
                                             <set>\r
-                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                                <parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
                                             </set>\r
                                         </outcome>\r
                                     </execute>\r
                                 </outcome>\r
                             </switch>\r
-                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" 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
+                            <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
                                 </outcome>\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
+                                <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>\r
                             </save>\r
@@ -207,7 +215,7 @@
                     </outcome>\r
                 </switch>\r
             </for>\r
-            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>\r
+            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>\r
         </block>\r
     </method>\r
 </service-logic>
\ No newline at end of file

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
index b9dbae7..9039685 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
@@ -1,88 +1,99 @@
-<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
+<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
         <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.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.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
-            <for index="pethidx" start="0" end="`$network-eth.node_length`">\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
+            </set>\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-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>\r
+                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />\r
                 </set>\r
-                <switch test="`$node-eth.termination-point_length`">\r
-                    <outcome value="">\r
-                        <block/>\r
+                <set>\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
                     </outcome>\r
-                    <outcome value="0">\r
-                        <block/>\r
+                    <outcome value='0'>\r
+                        <block></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
+                                </set>\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='`$network-otn.node[$potnidx].`' />\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>\r
+                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />\r
                                 </set>\r
                                 <set>\r
-                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>\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/>\r
+                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>\r
+                                    <outcome value=''>\r
+                                        <block></block>\r
                                     </outcome>\r
-                                    <outcome value="0">\r
-                                        <block/>\r
+                                    <outcome value='0'>\r
+                                        <block></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`' />\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" 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' \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
                                                     </save>\r
                                                 </outcome>\r
                                             </switch>\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
index 26e9f8f..8b19b0e 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "2d787bd1.a214b4",\r
+        "id": "317d0413.97b404",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 92,\r
-        "y": 22,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 125,\r
+        "y": 61,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "99a6e8f9.6615a8"\r
+                "56043ae0.d8ae54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99a6e8f9.6615a8",\r
+        "id": "56043ae0.d8ae54",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,427 +22,697 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 206,\r
-        "y": 125.00003051757812,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 239,\r
+        "y": 164.00003051757812,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "d3f739cf.6d5a28"\r
+                "1b0e9fc8.fec538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3f739cf.6d5a28",\r
+        "id": "1b0e9fc8.fec538",\r
         "type": "method",\r
         "name": "sotn-create-otn-tunnel",\r
         "xml": "<method rpc='sotn-create-otn-tunnel' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 217.0001220703125,\r
-        "y": 297,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 250.0001220703125,\r
+        "y": 336,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "eb49715b.e15e8"\r
+                "c6ff1d9b.4f5f78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acad5285.a3e1a",\r
+        "id": "95a2379b.0d1ce",\r
         "type": "comment",\r
         "name": "get cross-domain-link information",\r
         "info": "",\r
         "comments": "",\r
-        "x": 449.5001220703125,\r
-        "y": 31.286468505859375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 482.5001220703125,\r
+        "y": 70.28646850585938,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb49715b.e15e8",\r
+        "id": "c6ff1d9b.4f5f78",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 336.9688720703125,\r
-        "y": 425.74163818359375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 369.9688720703125,\r
+        "y": 464.74163818359375,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "96ed9e8f.b90f",\r
-                "f1e66bd.f624698",\r
-                "386c8b8a.515584"\r
+                "26b2f75.3503708",\r
+                "f64991bb.7d2d3",\r
+                "f13f2135.894b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96ed9e8f.b90f",\r
+        "id": "26b2f75.3503708",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncRestApi.token_id",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 586,\r
-        "y": 625,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 616,\r
+        "y": 1203,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "f9d6c529.483238",\r
-                "aec39761.70cfc8"\r
+                "6717edba.dd315c",\r
+                "9d26d203.bf1448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9d6c529.483238",\r
+        "id": "6717edba.dd315c",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 882.8438110351562,\r
-        "y": 580.1218872070312,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 912.8438110351562,\r
+        "y": 1158.1218872070312,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "cb912ed0.0c0a3"\r
+                "84d1cb1a.eb2fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aec39761.70cfc8",\r
+        "id": "9d26d203.bf1448",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 881.5,\r
-        "y": 659,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 911.5,\r
+        "y": 1237,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "a260c7eb.1e65d8"\r
+                "2182e897.132d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a260c7eb.1e65d8",\r
+        "id": "2182e897.132d8",\r
         "type": "execute",\r
-        "name": "execute RestconfApiCallNode Create ethernet Service with token",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193,\r
-        "y": 661,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1223,\r
+        "y": 1239,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "b31b1f14.b450e",\r
-                "31c0814c.e11a0e"\r
+                "1b911a1d.a19f46",\r
+                "ab8d3cb8.cfa08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb912ed0.0c0a3",\r
+        "id": "84d1cb1a.eb2fc8",\r
         "type": "execute",\r
-        "name": "execute RestconfApiCallNode Create ethernet Service without token",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1205,\r
-        "y": 584,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1235,\r
+        "y": 1162,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "31c0814c.e11a0e",\r
-                "b31b1f14.b450e"\r
+                "ab8d3cb8.cfa08",\r
+                "1b911a1d.a19f46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b31b1f14.b450e",\r
+        "id": "1b911a1d.a19f46",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1626.5,\r
-        "y": 652,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1656.5,\r
+        "y": 1230,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "6b799b05.9369c4"\r
+                "21fe6b2e.6608f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b799b05.9369c4",\r
+        "id": "21fe6b2e.6608f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1821,\r
-        "y": 645,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1851,\r
+        "y": 1223,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "401bdd4e.60ff34",\r
+        "id": "3680634b.3b9a5c",\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=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "x": 1795.5,\r
-        "y": 583,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1825.5,\r
+        "y": 1161,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "31c0814c.e11a0e",\r
+        "id": "ab8d3cb8.cfa08",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1611.5,\r
-        "y": 587,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1641.5,\r
+        "y": 1165,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "401bdd4e.60ff34"\r
+                "3680634b.3b9a5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1e66bd.f624698",\r
+        "id": "161d9ba6.9cb994",\r
         "type": "switchNode",\r
         "name": "switch eth topo's provider-id",\r
         "xml": "<switch test='`$oof.vpn.access-provider-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594,\r
-        "y": 173,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 627,\r
+        "y": 212,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "daa01201.b40fe",\r
-                "ffd4b2da.f2213"\r
+                "5e06ab69.dbc5bc",\r
+                "85ad793.798f588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa01201.b40fe",\r
+        "id": "5e06ab69.dbc5bc",\r
         "type": "outcome",\r
         "name": "domain A's OTN topo's provider ID",\r
-        "xml": "<outcome value='`$domain-A.provider-id`'>\n\u0001",\r
+        "xml": "<outcome value='`$domain-A.provider-id`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 897.285888671875,\r
-        "y": 108.82177734375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 930.285888671875,\r
+        "y": 147.82177734375,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "647bcb79.cd9c24"\r
+                "319f4a6b.cd0bbe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "647bcb79.cd9c24",\r
+        "id": "319f4a6b.cd0bbe",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1154.117431640625,\r
-        "y": 107.34027099609375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1187.117431640625,\r
+        "y": 146.34027099609375,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "7c841c48.339f24"\r
+                "a3bb1ab9.1257c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd4b2da.f2213",\r
+        "id": "85ad793.798f588",\r
         "type": "outcome",\r
         "name": "domain B's OTN topo's provider ID",\r
-        "xml": "<outcome value='`$domain-B.provider-id`'>\n\u0001",\r
+        "xml": "<outcome value='`$domain-B.provider-id`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 895,\r
-        "y": 212,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 928,\r
+        "y": 251,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "ada6a164.5b7e9"\r
+                "91623acb.3dd5b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c841c48.339f24",\r
+        "id": "a3bb1ab9.1257c",\r
         "type": "set",\r
         "name": "set otn domain node",\r
         "xml": "<set>\n<parameter name='tmp.otn-domain.' value='`$domain-A.`' />\n",\r
         "comments": "",\r
-        "x": 1359,\r
-        "y": 106,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1392,\r
+        "y": 145,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ada6a164.5b7e9",\r
+        "id": "91623acb.3dd5b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1150,\r
-        "y": 209,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1183,\r
+        "y": 248,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "24ca0ba6.6ddfe4"\r
+                "95015654.a72998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24ca0ba6.6ddfe4",\r
+        "id": "95015654.a72998",\r
         "type": "set",\r
         "name": "set otn domain node",\r
         "xml": "<set>\n<parameter name='$tmp.otn-domain.' value='`$domain-B.`' />\n",\r
         "comments": "",\r
-        "x": 1354.882568359375,\r
-        "y": 207.65972900390625,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1387.882568359375,\r
+        "y": 246.65972900390625,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "386c8b8a.515584",\r
+        "id": "990d58ad.7400d8",\r
         "type": "switchNode",\r
         "name": "switch eth node ID",\r
         "xml": "<switch test='`$oof.vpn.access-node-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 600,\r
-        "y": 427,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 639,\r
+        "y": 711,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "d91602b.4cd09",\r
-                "c018f42b.2b1a68"\r
+                "2ce24094.f713b",\r
+                "7ec071d2.b7a1f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d91602b.4cd09",\r
+        "id": "2ce24094.f713b",\r
         "type": "outcome",\r
         "name": "source eth node",\r
-        "xml": "<outcome value='`$oof.vpns[0].access-node-id`'>\n\u0001",\r
+        "xml": "<outcome value='`$oof.vpns[0].access-node-id`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 840.285888671875,\r
-        "y": 349.82177734375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 879.285888671875,\r
+        "y": 632.82177734375,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "fd2adb67.e7ca38"\r
+                "dd4b02f7.01e688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd2adb67.e7ca38",\r
+        "id": "dd4b02f7.01e688",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1044.117431640625,\r
-        "y": 349.34027099609375,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1083.117431640625,\r
+        "y": 632.3402709960938,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "ad11583e.e14ea8"\r
+                "aa1fe07a.cf8d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17b601bf.a39ace",\r
+        "id": "ddb0a3f1.d5a138",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1046,\r
-        "y": 469,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1085,\r
+        "y": 752,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "97fd4aa8.fd21b8"\r
+                "da3e33dd.52f4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c018f42b.2b1a68",\r
+        "id": "7ec071d2.b7a1f8",\r
         "type": "outcome",\r
         "name": "dest eth node",\r
-        "xml": "<outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>\n\u0001",\r
+        "xml": "<outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 841,\r
-        "y": 469,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 880,\r
+        "y": 752,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": [\r
             [\r
-                "17b601bf.a39ace"\r
+                "ddb0a3f1.d5a138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad11583e.e14ea8",\r
+        "id": "aa1fe07a.cf8d18",\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
         "comments": "",\r
-        "x": 1286,\r
-        "y": 350,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1325,\r
+        "y": 633,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4add26c3.ec74e8",\r
+        "id": "163a9a7c.f94c4e",\r
         "type": "comment",\r
         "name": "cross domain OTN node is the dest of OTN tunnel",\r
         "info": "",\r
         "comments": "",\r
-        "x": 945,\r
-        "y": 306,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 984,\r
+        "y": 589,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15de3156.c96c3f",\r
+        "id": "295b6b41.b99cfc",\r
         "type": "comment",\r
         "name": "cross domain OTN node is the source of OTN tunnel",\r
         "info": "",\r
         "comments": "",\r
-        "x": 954,\r
-        "y": 429,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 993,\r
+        "y": 712,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "da3e33dd.52f4e8",\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
+        "comments": "",\r
+        "x": 1333,\r
+        "y": 757,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "78e806c9.b8028",\r
+        "type": "failure",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 877,\r
+        "y": 828,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "a1380a33.f7da"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f64991bb.7d2d3",\r
+        "type": "execute",\r
+        "name": "uni-tp-id contains src-pnf-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 663,\r
+        "y": 827,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "78e806c9.b8028",\r
+                "c58e7233.0e544"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c58e7233.0e544",\r
+        "type": "failure",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 878,\r
+        "y": 876,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "716e2d25.6fe90c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "716e2d25.6fe90c",\r
+        "type": "execute",\r
+        "name": "uni-tp-id contains dst-pnf-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1087,\r
+        "y": 874,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "b2082b04.764078"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2082b04.764078",\r
+        "type": "failure",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1301,\r
+        "y": 875,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "facf7dd6.b833c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a1380a33.f7da",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1057,\r
+        "y": 825,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "77be498b.1e80d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "facf7dd6.b833c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1470,\r
+        "y": 872,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "5ad550e4.a3ef2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2fce99ef.66ce96",\r
+        "type": "failure",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 858,\r
+        "y": 373,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "62b7c2e9.915bfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f13f2135.894b48",\r
+        "type": "execute",\r
+        "name": "uni-tp-id contains domain-A.network-id",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$domain-A.network-id`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 623,\r
+        "y": 372,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "2fce99ef.66ce96",\r
+                "c8a39e1a.853cd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8a39e1a.853cd",\r
+        "type": "failure",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 830,\r
+        "y": 423,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "9c03510d.95d8f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84bd363f.cecab",\r
+        "type": "failure",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1282,\r
+        "y": 420,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "319183ef.947ad4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "62b7c2e9.915bfc",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1038,\r
+        "y": 370,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "feb246e9.3add2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "feb246e9.3add2",\r
+        "type": "set",\r
+        "name": "set otn domain node",\r
+        "xml": "<set>\n<parameter name='otn-domain.' value='`$domain-A.`' />\n",\r
+        "comments": "",\r
+        "x": 1242.882568359375,\r
+        "y": 368.65972900390625,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "319183ef.947ad4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1451,\r
+        "y": 417,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "5f5c2180.97a72"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f5c2180.97a72",\r
+        "type": "set",\r
+        "name": "set otn domain node",\r
+        "xml": "<set>\n<parameter name='$otn-domain.' value='`$domain-B.`' />\n",\r
+        "comments": "",\r
+        "x": 1655.882568359375,\r
+        "y": 415.65972900390625,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": []\r
+    },\r
+    {\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
+        "comments": "",\r
+        "x": 1269,\r
+        "y": 823,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97fd4aa8.fd21b8",\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
         "comments": "",\r
-        "x": 1294,\r
-        "y": 474,\r
-        "z": "17040f2b.d4a821",\r
+        "x": 1669,\r
+        "y": 872,\r
+        "z": "3b47dc40.0a0c44",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "9c03510d.95d8f8",\r
+        "type": "execute",\r
+        "name": "uni-tp-id contains domain-B.network-id",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name='source' value='`$oof.vpn.tp-id`' />\n    <parameter name='target' value='`$domain-B.network-id`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1059,\r
+        "y": 423,\r
+        "z": "3b47dc40.0a0c44",\r
+        "wires": [\r
+            [\r
+                "84bd363f.cecab"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
index 1046371..5800585 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
@@ -1,1239 +1,1360 @@
-[
-  {
-    "id": "ca266b03.5b0c68",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 91.4998779296875,
-    "y": 34,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9db70ac2.5a0448"
-      ]
-    ]
-  },
-  {
-    "id": "9db70ac2.5a0448",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs": 1,
-    "x": 216.4998779296875,
-    "y": 360.00001525878906,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "f6e8674b.eb6ef8"
-      ]
-    ]
-  },
-  {
-    "id": "f6e8674b.eb6ef8",
-    "type": "method",
-    "name": "sotn-get-otn-tunnel-path-from-oof",
-    "xml": "<method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 280.5,
-    "y": 453,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "d8a649df.dd5438"
-      ]
-    ]
-  },
-  {
-    "id": "4cb8a9dc.c82628",
-    "type": "execute",
-    "name": "execute RestApiCallNode getPath from OOF",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 763.4729614257812,
-    "y": 111.99600219726562,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c9ad9647.3c4fa8",
-        "65b028f1.fd8198"
-      ]
-    ]
-  },
-  {
-    "id": "c9ad9647.3c4fa8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1003.4731025695801,
-    "y": 135.9959716796875,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "43f1fecc.bf7f"
-      ]
-    ]
-  },
-  {
-    "id": "b1305a70.64e458",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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=\"Error executing OOF api\" />\n",
-    "comments": "",
-    "x": 1142.4731369018555,
-    "y": 84.99606323242188,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "65b028f1.fd8198",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1002.4728889465332,
-    "y": 84.99606227874756,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b1305a70.64e458"
-      ]
-    ]
-  },
-  {
-    "id": "13911536.3440bb",
-    "type": "comment",
-    "name": "OTN tunnel path computation",
-    "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
-    "comments": "",
-    "x": 734.9767608642578,
-    "y": 68.00000190734863,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "7480efc5.dbe2e",
-    "type": "for",
-    "name": "for vidx..otn-oof.otn-links_length[]",
-    "xml": "<for index='vidx' start='0' end='`$otn-oof.otn-links_length`' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 754.4727783203125,
-    "y": 421.2457275390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b98c91e0.3766f"
-      ]
-    ]
-  },
-  {
-    "id": "689331c8.a7329",
-    "type": "comment",
-    "name": "Loop through OTN links",
-    "info": "",
-    "comments": "",
-    "x": 837.9730834960938,
-    "y": 500.74609375,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "b98c91e0.3766f",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 859,
-    "y": 612.2864990234375,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3a76e5ee.5f99aa",
-        "a8939d2.521b76"
-      ]
-    ]
-  },
-  {
-    "id": "3a76e5ee.5f99aa",
-    "type": "get-resource",
-    "name": "get-resource cross-link",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1126,
-    "y": 532.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "74ae6f25.c8093",
-        "d101f4ee.f9f8d8",
-        "7558125c.21685c"
-      ]
-    ]
-  },
-  {
-    "id": "74ae6f25.c8093",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1356.5,
-    "y": 477.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a0d35b9e.4c4448"
-      ]
-    ]
-  },
-  {
-    "id": "d101f4ee.f9f8d8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1367.5,
-    "y": 534.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "aab3f9be.7515c8"
-      ]
-    ]
-  },
-  {
-    "id": "7558125c.21685c",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1361.5,
-    "y": 584.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c5929dad.e1e45"
-      ]
-    ]
-  },
-  {
-    "id": "aab3f9be.7515c8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 1528.5,
-    "y": 523.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c5929dad.e1e45",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 1526.5,
-    "y": 579.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "51d46963.f916e8",
-    "type": "set",
-    "name": "set src-ltpId and dst-ltpId",
-    "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2318,
-    "y": 396.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c5a99f90.0d85b",
-    "type": "comment",
-    "name": "get cross-domain-link information",
-    "info": "",
-    "comments": "",
-    "x": 1127,
-    "y": 493.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "a8939d2.521b76",
-    "type": "set",
-    "name": "set otn-oof.link-name",
-    "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].`' />",
-    "comments": "",
-    "x": 1108.5,
-    "y": 442.2864685058594,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "43f1fecc.bf7f",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1148.5001487731934,
-    "y": 133.74145698547363,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d8a649df.dd5438",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 521.4687614440918,
-    "y": 379.74163722991943,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "4cb8a9dc.c82628",
-        "7480efc5.dbe2e"
-      ]
-    ]
-  },
-  {
-    "id": "a0d35b9e.4c4448",
-    "type": "switchNode",
-    "name": "test cross-domain-link",
-    "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1562,
-    "y": 476,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9c05dfa6.ba207"
-      ]
-    ]
-  },
-  {
-    "id": "9c05dfa6.ba207",
-    "type": "outcome",
-    "name": "outcome cross-domain-link",
-    "xml": "<outcome value='cross-domain-link'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1809,
-    "y": 477,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "ff68def.188c12"
-      ]
-    ]
-  },
-  {
-    "id": "1ed1e43f.527cac",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2154,
-    "y": 955,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "ff68def.188c12",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2028,
-    "y": 479,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "1ed1e43f.527cac",
-        "51d46963.f916e8",
-        "44b19c4e.886594",
-        "5702d427.f65a4c"
-      ]
-    ]
-  },
-  {
-    "id": "2017012b.18bf6e",
-    "type": "comment",
-    "name": "setup variables",
-    "info": "",
-    "comments": "",
-    "x": 2286,
-    "y": 335,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "44b19c4e.886594",
-    "type": "get-resource",
-    "name": "get-resource src tp",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"p-interface.interface-name = $tmp.src-ltpId \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2315,
-    "y": 485,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "675b31ba.fc29c",
-        "e7ba827c.7802e",
-        "3d3ce0b1.c355d"
-      ]
-    ]
-  },
-  {
-    "id": "675b31ba.fc29c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2548.5,
-    "y": 446,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "8f945f43.0f6a1",
-        "35d184a7.0348bc"
-      ]
-    ]
-  },
-  {
-    "id": "e7ba827c.7802e",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2545.5,
-    "y": 504,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9bcbfa8e.5a3ae8"
-      ]
-    ]
-  },
-  {
-    "id": "3d3ce0b1.c355d",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2548.5,
-    "y": 556,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c82ee5b.1546f18"
-      ]
-    ]
-  },
-  {
-    "id": "9bcbfa8e.5a3ae8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2730.5,
-    "y": 508,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "c82ee5b.1546f18",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2718.5,
-    "y": 559,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "8f945f43.0f6a1",
-    "type": "set",
-    "name": "set tmp.src-pnf-name",
-    "xml": "<set>\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2749,
-    "y": 393,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "35d184a7.0348bc",
-    "type": "get-resource",
-    "name": "get-resource src pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2739,
-    "y": 448,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "9ea9cbf0.fa9328",
-        "aa8e1680.d1d798",
-        "dd38a5b5.866808"
-      ]
-    ]
-  },
-  {
-    "id": "9ea9cbf0.fa9328",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3022.5,
-    "y": 401,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "899a7ec6.41ab2"
-      ]
-    ]
-  },
-  {
-    "id": "aa8e1680.d1d798",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3014.5,
-    "y": 456,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "56667146.5a8cd"
-      ]
-    ]
-  },
-  {
-    "id": "dd38a5b5.866808",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3019.5,
-    "y": 513,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "49c4c4a9.a9af7c"
-      ]
-    ]
-  },
-  {
-    "id": "56667146.5a8cd",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 3182.5,
-    "y": 459,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "49c4c4a9.a9af7c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 3171.5,
-    "y": 514,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "3a58b291.1cf89e",
-    "type": "set",
-    "name": "set domain A node ttp-id",
-    "xml": "<set>\n<parameter name='tmp.src-ttp-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4234,
-    "y": 262,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "6baf1c09.23f524",
-    "type": "get-resource",
-    "name": "get-resource src TTP",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.src-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4223,
-    "y": 333,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "e53fa55a.80c878"
-      ]
-    ]
-  },
-  {
-    "id": "e53fa55a.80c878",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4414.5,
-    "y": 330,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "fb4eb6f8.67d008"
-      ]
-    ]
-  },
-  {
-    "id": "fb4eb6f8.67d008",
-    "type": "set",
-    "name": "set domain A node ttp-id",
-    "xml": "<set>\n<parameter name='domain-A.ttp-id' value=\"`$tmp.aai.src-ttp.ttp-id`\" />\n",
-    "comments": "",
-    "x": 4627,
-    "y": 329,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "151d93fd.7167ec",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 4019,
-    "y": 512,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "fb4c025e.b4687",
-        "2b826247.b8392e"
-      ]
-    ]
-  },
-  {
-    "id": "a6f18660.f8abe8",
-    "type": "outcome",
-    "name": "tunnel-termination-point",
-    "xml": "<outcome value='tunnel-termination-point'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3815.16845703125,
-    "y": 325.48150634765625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "45ebcf03.0e118"
-      ]
-    ]
-  },
-  {
-    "id": "1ff26720.4f6889",
-    "type": "for",
-    "name": "for each relationship",
-    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3381.882568359375,
-    "y": 398.65972900390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "89b5166.0c594e8"
-      ]
-    ]
-  },
-  {
-    "id": "89b5166.0c594e8",
-    "type": "switchNode",
-    "name": "switch related-to",
-    "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3607.882568359375,
-    "y": 398.65972900390625,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a6f18660.f8abe8",
-        "376f0574.e1601a"
-      ]
-    ]
-  },
-  {
-    "id": "899a7ec6.41ab2",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 3166.88232421875,
-    "y": 398.6556701660156,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "1ff26720.4f6889",
-        "29ff2ed5.ef4af2"
-      ]
-    ]
-  },
-  {
-    "id": "29ff2ed5.ef4af2",
-    "type": "set",
-    "name": "set domain A node-id and tpn",
-    "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",
-    "comments": "",
-    "x": 3426,
-    "y": 309,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "376f0574.e1601a",
-    "type": "outcome",
-    "name": "network-resource",
-    "xml": "<outcome value='network-resource'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3806,
-    "y": 511,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "151d93fd.7167ec"
-      ]
-    ]
-  },
-  {
-    "id": "fb4c025e.b4687",
-    "type": "set",
-    "name": "set domain A network-id",
-    "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4254,
-    "y": 442,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "45ebcf03.0e118",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 4017,
-    "y": 321,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3a58b291.1cf89e",
-        "6baf1c09.23f524"
-      ]
-    ]
-  },
-  {
-    "id": "2b826247.b8392e",
-    "type": "get-resource",
-    "name": "get-resource src network-resource",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4262,
-    "y": 523,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "f37dd233.a3308"
-      ]
-    ]
-  },
-  {
-    "id": "f37dd233.a3308",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4494.5,
-    "y": 519,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "5f1b14c5.d2a03c"
-      ]
-    ]
-  },
-  {
-    "id": "5f1b14c5.d2a03c",
-    "type": "set",
-    "name": "set domain A network-id, topo-id, client-id, etc",
-    "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",
-    "comments": "",
-    "x": 4736,
-    "y": 513,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "5702d427.f65a4c",
-    "type": "get-resource",
-    "name": "get-resource dst tp",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"p-interface.interface-name = $tmp.dst-ltpId \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2269,
-    "y": 851,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "a50293a4.5e79e",
-        "b4058651.f77518",
-        "b61d9ed.988616"
-      ]
-    ]
-  },
-  {
-    "id": "a50293a4.5e79e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2502.5,
-    "y": 812,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "46502cec.4be0b4",
-        "a897aaea.70dd38"
-      ]
-    ]
-  },
-  {
-    "id": "b4058651.f77518",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2499.5,
-    "y": 870,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "da3111af.853e5"
-      ]
-    ]
-  },
-  {
-    "id": "b61d9ed.988616",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2502.5,
-    "y": 922,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c09ee4e6.15ed68"
-      ]
-    ]
-  },
-  {
-    "id": "c09ee4e6.15ed68",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2672.5,
-    "y": 925,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "da3111af.853e5",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2684.5,
-    "y": 874,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "a897aaea.70dd38",
-    "type": "get-resource",
-    "name": "get-resource dst pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2693,
-    "y": 814,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "b6f4d1fe.0b8da",
-        "46d13a0d.575974",
-        "94eeb806.b26748"
-      ]
-    ]
-  },
-  {
-    "id": "46502cec.4be0b4",
-    "type": "set",
-    "name": "set tmp.dst-pnf-name",
-    "xml": "<set>\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2703,
-    "y": 759,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "94eeb806.b26748",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2973.5,
-    "y": 879,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "efc946ae.7bf158"
-      ]
-    ]
-  },
-  {
-    "id": "46d13a0d.575974",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2968.5,
-    "y": 822,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "feb7d1d7.3486e"
-      ]
-    ]
-  },
-  {
-    "id": "b6f4d1fe.0b8da",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2976.5,
-    "y": 767,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "100cc1d.c89dc3e"
-      ]
-    ]
-  },
-  {
-    "id": "feb7d1d7.3486e",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 3136.5,
-    "y": 825,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "efc946ae.7bf158",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 3125.5,
-    "y": 880,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "100cc1d.c89dc3e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 3120.88232421875,
-    "y": 764.6556701660156,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3e2a3b9f.7272c4",
-        "b6c39e63.6b538"
-      ]
-    ]
-  },
-  {
-    "id": "3e2a3b9f.7272c4",
-    "type": "for",
-    "name": "for each relationship",
-    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3335.882568359375,
-    "y": 764.6597290039062,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "c77ddef5.18c3e"
-      ]
-    ]
-  },
-  {
-    "id": "c77ddef5.18c3e",
-    "type": "switchNode",
-    "name": "switch related-to",
-    "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3561.882568359375,
-    "y": 764.6597290039062,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3576c9a1.155776",
-        "131550c4.86635f"
-      ]
-    ]
-  },
-  {
-    "id": "b6c39e63.6b538",
-    "type": "set",
-    "name": "set domain B node-id and tpn",
-    "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",
-    "comments": "",
-    "x": 3380,
-    "y": 675,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "3f07ba63.1a2cc6",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 3973,
-    "y": 878,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "68ee333a.5e149c",
-        "57b260c0.16164"
-      ]
-    ]
-  },
-  {
-    "id": "3576c9a1.155776",
-    "type": "outcome",
-    "name": "tunnel-termination-point",
-    "xml": "<outcome value='tunnel-termination-point'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3769.16845703125,
-    "y": 691.4815063476562,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "63e95b18.c47c14"
-      ]
-    ]
-  },
-  {
-    "id": "131550c4.86635f",
-    "type": "outcome",
-    "name": "network-resource",
-    "xml": "<outcome value='network-resource'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3760,
-    "y": 877,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "3f07ba63.1a2cc6"
-      ]
-    ]
-  },
-  {
-    "id": "63e95b18.c47c14",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 3971,
-    "y": 687,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "e883466f.992618",
-        "f5edbf24.92d52"
-      ]
-    ]
-  },
-  {
-    "id": "e883466f.992618",
-    "type": "set",
-    "name": "set domain B node ttp-id",
-    "xml": "<set>\n<parameter name='tmp.dst-ttp-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4188,
-    "y": 628,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "f5edbf24.92d52",
-    "type": "get-resource",
-    "name": "get-resource dst TTP",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.dst-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4177,
-    "y": 699,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "70320551.17869c"
-      ]
-    ]
-  },
-  {
-    "id": "70320551.17869c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4368.5,
-    "y": 696,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "78931a0a.3bac14"
-      ]
-    ]
-  },
-  {
-    "id": "78931a0a.3bac14",
-    "type": "set",
-    "name": "set domain B node ttp-id",
-    "xml": "<set>\n<parameter name='domain-B.ttp-id' value=\"`$tmp.aai.dst-ttp.ttp-id`\" />\n",
-    "comments": "",
-    "x": 4581,
-    "y": 695,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "68ee333a.5e149c",
-    "type": "set",
-    "name": "set domain B network-id",
-    "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 4208,
-    "y": 808,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  },
-  {
-    "id": "57b260c0.16164",
-    "type": "get-resource",
-    "name": "get-resource dst network-resource",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4216,
-    "y": 889,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "acb8778c.80c2b8"
-      ]
-    ]
-  },
-  {
-    "id": "acb8778c.80c2b8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4448.5,
-    "y": 885,
-    "z": "cb55ab48.d781c8",
-    "wires": [
-      [
-        "24fd155e.59dcba"
-      ]
-    ]
-  },
-  {
-    "id": "24fd155e.59dcba",
-    "type": "set",
-    "name": "set domain B network-id, topo-id, client-id, etc",
-    "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",
-    "comments": "",
-    "x": 4690,
-    "y": 879,
-    "z": "cb55ab48.d781c8",
-    "wires": []
-  }
+[\r
+    {\r
+        "id": "aa75113b.2c42b8",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 136,\r
+        "y": 78,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ab15dc15.738968"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ab15dc15.738968",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 261,\r
+        "y": 404.00001525878906,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a46085e4.dea2f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a46085e4.dea2f",\r
+        "type": "method",\r
+        "name": "sotn-get-otn-tunnel-path-from-oof",\r
+        "xml": "<method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 325.0001220703125,\r
+        "y": 497,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "7d5a0cd3.c6dfbc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f51f5245.de05e8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode getPath from OOF",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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": 807.9730834960938,\r
+        "y": 155.99600219726562,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "8059dde9.1ce2e",\r
+                "dd740bdc.617d78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8059dde9.1ce2e",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1047.9732246398926,\r
+        "y": 179.9959716796875,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "35b68c0d.85ca94"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6c823726.8cfc2",\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=\"Error executing OOF api\" />\n",\r
+        "comments": "",\r
+        "x": 1186.973258972168,\r
+        "y": 128.99606323242188,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "dd740bdc.617d78",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1046.9730110168457,\r
+        "y": 128.99606227874756,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "6c823726.8cfc2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1cad6ca3.0c0a23",\r
+        "type": "comment",\r
+        "name": "OTN tunnel path computation",\r
+        "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",\r
+        "comments": "",\r
+        "x": 779.4768829345703,\r
+        "y": 112.00000190734863,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "500e653c.02a91c",\r
+        "type": "for",\r
+        "name": "for vidx..otn-oof.solutions_length[]",\r
+        "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 798.972900390625,\r
+        "y": 465.2457275390625,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "6dab679f.e9004"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "df52b38a.7717c",\r
+        "type": "comment",\r
+        "name": "Loop through OTN links",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 882.4732055664062,\r
+        "y": 544.74609375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6dab679f.e9004",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 903.5001220703125,\r
+        "y": 656.2864990234375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "58b38e8f.68cb58",\r
+                "31a7d8e8.5f496"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "58b38e8f.68cb58",\r
+        "type": "get-resource",\r
+        "name": "get-resource cross-link",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1170.5001220703125,\r
+        "y": 576.2864685058594,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a7dfe4ca.7050a8",\r
+                "147899e8.194c7e",\r
+                "bd646a50.9ca6d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bd646a50.9ca6d",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1362.0001220703125,\r
+        "y": 521.2864685058594,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "7d949923.feaea8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a7dfe4ca.7050a8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1389.0001220703125,\r
+        "y": 756.2864990234375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "6604b8e.b3db548"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "147899e8.194c7e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1383.0001220703125,\r
+        "y": 806.2864990234375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "61e58c1.1c151f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6604b8e.b3db548",\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": 1550.0001220703125,\r
+        "y": 745.2864990234375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "61e58c1.1c151f4",\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": 1548.0001220703125,\r
+        "y": 801.2864990234375,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3a661a62.460126",\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[0].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 2362.5001220703125,\r
+        "y": 440.2864685058594,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a01c1aa6.b32a",\r
+        "type": "comment",\r
+        "name": "get cross-domain-link information",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1171.5001220703125,\r
+        "y": 537.2864685058594,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "31a7d8e8.5f496",\r
+        "type": "set",\r
+        "name": "set otn-oof.link-name",\r
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />",\r
+        "comments": "",\r
+        "x": 1153.0001220703125,\r
+        "y": 486.2864685058594,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "35b68c0d.85ca94",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1193.0002708435059,\r
+        "y": 177.74145698547363,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d5a0cd3.c6dfbc",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 565.9688835144043,\r
+        "y": 423.74163722991943,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "500e653c.02a91c",\r
+                "f51f5245.de05e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "40299798.13bc",\r
+        "type": "switchNode",\r
+        "name": "test cross-domain-link",\r
+        "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1677.5001220703125,\r
+        "y": 521,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "53a2c424.a12b74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "53a2c424.a12b74",\r
+        "type": "outcome",\r
+        "name": "outcome cross-domain",\r
+        "xml": "<outcome value='cross-domain'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1913.5001220703125,\r
+        "y": 522,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "7c9bf405.132f7c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dd179bba.27e578",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 2198.5001220703125,\r
+        "y": 999,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7c9bf405.132f7c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2116.5001220703125,\r
+        "y": 523,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "dd179bba.27e578",\r
+                "3a661a62.460126",\r
+                "a736e107.ab857",\r
+                "51dd454b.e64094"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b97c4b80.2182d",\r
+        "type": "comment",\r
+        "name": "setup variables",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2330.5001220703125,\r
+        "y": 379,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a736e107.ab857",\r
+        "type": "get-resource",\r
+        "name": "get-resource src tp",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2359.5001220703125,\r
+        "y": 529,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "30082dde.5085da",\r
+                "a603f43.0659d88",\r
+                "ed057305.d13bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "30082dde.5085da",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2593.0001220703125,\r
+        "y": 490,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "b104de88.84b78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a603f43.0659d88",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2590.0001220703125,\r
+        "y": 548,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "8496f5b4.9321e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed057305.d13bc",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2593.0001220703125,\r
+        "y": 600,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "1dbdbb79.fd0ced"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8496f5b4.9321e8",\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": 2775.0001220703125,\r
+        "y": 552,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1dbdbb79.fd0ced",\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": 2763.0001220703125,\r
+        "y": 603,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "94adb9b9.7a0948",\r
+        "type": "set",\r
+        "name": "set tmp.src-pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 2872.5,\r
+        "y": 445,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a5379b59.d56668",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2871.5,\r
+        "y": 488,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "fc1e5cdb.f87da8",\r
+                "c1dbffa0.3a6ef8",\r
+                "e17cdd49.4fcf08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fc1e5cdb.f87da8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3067.0001220703125,\r
+        "y": 445,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "372db61f.e21a7a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c1dbffa0.3a6ef8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3059.0001220703125,\r
+        "y": 500,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "8f21b6ce.dd76a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e17cdd49.4fcf08",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3064.0001220703125,\r
+        "y": 557,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "e804e037.dd4f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8f21b6ce.dd76a",\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": 3227.0001220703125,\r
+        "y": 503,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e804e037.dd4f",\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": 3216.0001220703125,\r
+        "y": 558,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e0784723.78ca28",\r
+        "type": "set",\r
+        "name": "set domain A node ttp-id",\r
+        "xml": "<set>\n<parameter name='tmp.src-ttp-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 4278.5001220703125,\r
+        "y": 306,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1b6b3639.216dba",\r
+        "type": "get-resource",\r
+        "name": "get-resource src TTP",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.src-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4267.5001220703125,\r
+        "y": 377,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ac3848e1.acfdf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ac3848e1.acfdf8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4459.0001220703125,\r
+        "y": 374,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ebf0e7da.b09cb"\r
+            ]\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
+        "comments": "",\r
+        "x": 4671.5001220703125,\r
+        "y": 373,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ae40696e.4ae89",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4063.5001220703125,\r
+        "y": 556,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a860374.60c54c8",\r
+                "f3ee54c1.b5d84"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "577de1c9.7d7528",\r
+        "type": "outcome",\r
+        "name": "tunnel-termination-point",\r
+        "xml": "<outcome value='tunnel-termination-point'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3859.6685791015625,\r
+        "y": 369.48150634765625,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "2ec73e0f.7a316a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f827e10.2f07d2",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3426.3826904296875,\r
+        "y": 442.65972900390625,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "7df05538.ae1e24"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7df05538.ae1e24",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3652.3826904296875,\r
+        "y": 442.65972900390625,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "577de1c9.7d7528",\r
+                "1569d56e.fb5f8b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "372db61f.e21a7a",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3211.3824462890625,\r
+        "y": 442.6556701660156,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "3f827e10.2f07d2",\r
+                "9cbdf6a0.b391f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9cbdf6a0.b391f",\r
+        "type": "set",\r
+        "name": "set domain A node-id and tpn",\r
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",\r
+        "comments": "",\r
+        "x": 3470.5001220703125,\r
+        "y": 353,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1569d56e.fb5f8b",\r
+        "type": "outcome",\r
+        "name": "network-resource",\r
+        "xml": "<outcome value='network-resource'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3850.5001220703125,\r
+        "y": 555,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ae40696e.4ae89"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a860374.60c54c8",\r
+        "type": "set",\r
+        "name": "set domain A network-id",\r
+        "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 4298.5001220703125,\r
+        "y": 486,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2ec73e0f.7a316a",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4061.5001220703125,\r
+        "y": 365,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "e0784723.78ca28",\r
+                "1b6b3639.216dba"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3ee54c1.b5d84",\r
+        "type": "get-resource",\r
+        "name": "get-resource src 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 = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4306.5001220703125,\r
+        "y": 567,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "9ea34049.8c12a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ea34049.8c12a8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4539.0001220703125,\r
+        "y": 563,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "c512a46.74a5bd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c512a46.74a5bd8",\r
+        "type": "set",\r
+        "name": "set domain A network-id, topo-id, client-id, etc",\r
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4780.5001220703125,\r
+        "y": 557,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "51dd454b.e64094",\r
+        "type": "get-resource",\r
+        "name": "get-resource dst tp",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2313.5001220703125,\r
+        "y": 895,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a793d2c3.cd625",\r
+                "8024d4d5.2b62d8",\r
+                "765b5b90.f1ecd4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a793d2c3.cd625",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2547.0001220703125,\r
+        "y": 856,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "75eb9694.598e48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8024d4d5.2b62d8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2544.0001220703125,\r
+        "y": 914,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "612d2397.585244"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "765b5b90.f1ecd4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2547.0001220703125,\r
+        "y": 966,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a08bb92f.3f7318"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a08bb92f.3f7318",\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": 2717.0001220703125,\r
+        "y": 969,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "612d2397.585244",\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": 2729.0001220703125,\r
+        "y": 918,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "670f7157.4b83f",\r
+        "type": "get-resource",\r
+        "name": "get-resource dst pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2825.5,\r
+        "y": 859,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "3389e479.7caf4c",\r
+                "a22904b1.12c91",\r
+                "3f4df7a2.550db8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fbc3aa3e.92a1d",\r
+        "type": "set",\r
+        "name": "set tmp.dst-pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 2830.5,\r
+        "y": 807,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3f4df7a2.550db8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3018.0001220703125,\r
+        "y": 923,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a7bbc350.7f29"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a22904b1.12c91",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3013.0001220703125,\r
+        "y": 866,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a788922c.a2883"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3389e479.7caf4c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3021.0001220703125,\r
+        "y": 811,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "b1d95d9.2f8af2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a788922c.a2883",\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": 3181.0001220703125,\r
+        "y": 869,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a7bbc350.7f29",\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": 3170.0001220703125,\r
+        "y": 924,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b1d95d9.2f8af2",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3165.3824462890625,\r
+        "y": 808.6556701660156,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "b971a7f5.c553f",\r
+                "861cb0b.d019fd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b971a7f5.c553f",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3380.3826904296875,\r
+        "y": 808.6597290039062,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "ba0c1a8c.88af28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba0c1a8c.88af28",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3606.3826904296875,\r
+        "y": 808.6597290039062,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "799147c0.a8a33",\r
+                "f903181b.00f37"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "861cb0b.d019fd",\r
+        "type": "set",\r
+        "name": "set domain B node-id and tpn",\r
+        "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",\r
+        "comments": "",\r
+        "x": 3424.5001220703125,\r
+        "y": 719,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "802f4f2.687563",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4017.5001220703125,\r
+        "y": 922,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "d4d32344.490fe8",\r
+                "1ab02c14.0e8e64"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "799147c0.a8a33",\r
+        "type": "outcome",\r
+        "name": "tunnel-termination-point",\r
+        "xml": "<outcome value='tunnel-termination-point'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3813.6685791015625,\r
+        "y": 735.4815063476562,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "9e4db8b6.012fb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f903181b.00f37",\r
+        "type": "outcome",\r
+        "name": "network-resource",\r
+        "xml": "<outcome value='network-resource'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3804.5001220703125,\r
+        "y": 921,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "802f4f2.687563"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e4db8b6.012fb",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4015.5001220703125,\r
+        "y": 731,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "99609484.86254",\r
+                "f094147a.c54bb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "99609484.86254",\r
+        "type": "set",\r
+        "name": "set domain B node ttp-id",\r
+        "xml": "<set>\n<parameter name='tmp.dst-ttp-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 4232.5001220703125,\r
+        "y": 672,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f094147a.c54bb8",\r
+        "type": "get-resource",\r
+        "name": "get-resource dst TTP",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.dst-ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4221.5001220703125,\r
+        "y": 743,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "96cf01de.ff5148"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "96cf01de.ff5148",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4413.0001220703125,\r
+        "y": 740,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "5bd66639.66f16"\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
+        "name": "set domain B network-id",\r
+        "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 4252.5001220703125,\r
+        "y": 852,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1ab02c14.0e8e64",\r
+        "type": "get-resource",\r
+        "name": "get-resource dst 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 = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4260.5001220703125,\r
+        "y": 933,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "e204fe22.e747c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e204fe22.e747c8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4493.0001220703125,\r
+        "y": 929,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "c2250516.6a88f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c2250516.6a88f",\r
+        "type": "set",\r
+        "name": "set domain B network-id, topo-id, client-id, etc",\r
+        "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4734.5001220703125,\r
+        "y": 923,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b104de88.84b78",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2682,\r
+        "y": 366,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "a5379b59.d56668"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "75eb9694.598e48",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2637,\r
+        "y": 744,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "670f7157.4b83f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c0faec82.816fb8",\r
+        "type": "switchNode",\r
+        "name": "test $vidx",\r
+        "xml": "<switch test='`$vidx`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1622,\r
+        "y": 602,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "b7d58fe7.9f74b8",\r
+                "dc6562ba.9ee77"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b7d58fe7.9f74b8",\r
+        "type": "outcome",\r
+        "name": "outcome first",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1787,\r
+        "y": 580,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "197e1ba0.21ad04"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc6562ba.9ee77",\r
+        "type": "outcome",\r
+        "name": "outcome last",\r
+        "xml": "<outcome value='`$otn-oof.solutions_length - 1`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1786,\r
+        "y": 641,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "1e901248.1aaca6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "197e1ba0.21ad04",\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[0].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-first-src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`\" />\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1980,\r
+        "y": 582,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1e901248.1aaca6",\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[1].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-last-dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 1979,\r
+        "y": 640,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7d949923.feaea8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1496,\r
+        "y": 523,\r
+        "z": "5b68e0d.bd97b2",\r
+        "wires": [\r
+            [\r
+                "40299798.13bc",\r
+                "c0faec82.816fb8"\r
+            ]\r
+        ]\r
+    }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
index 811602d..119b8fd 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "92076785.102998",\r
+        "id": "9fd2e6b.eda7a18",\r
         "type": "for",\r
         "name": "for each sotn-get-request-input-param",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 257,\r
-        "y": 366.6666383743286,\r
-        "z": "12466ca0.33d983",\r
+        "x": 323,\r
+        "y": 423.6666383743286,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "1481334b.aa109d"\r
+                "61a5fd01.4ba864"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d17e9aae.69c2d8",\r
+        "id": "78b38914.249678",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 89.3332290649414,\r
-        "y": 29,\r
-        "z": "12466ca0.33d983",\r
+        "x": 155.3332290649414,\r
+        "y": 86,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "28ba91d2.47447e"\r
+                "2dca576b.96f79"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28ba91d2.47447e",\r
+        "id": "2dca576b.96f79",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -38,206 +38,206 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 234.33323287963867,\r
-        "y": 110.0000171661377,\r
-        "z": "12466ca0.33d983",\r
+        "x": 300.3332328796387,\r
+        "y": 167.0000171661377,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "bfc0526a.9023d"\r
+                "be702e8f.3597d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfc0526a.9023d",\r
+        "id": "be702e8f.3597d",\r
         "type": "method",\r
         "name": "sotn-get-vf-module-uni-param",\r
         "xml": "<method rpc='sotn-get-vf-module-uni-param' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 222.3333511352539,\r
-        "y": 198,\r
-        "z": "12466ca0.33d983",\r
+        "x": 288.3333511352539,\r
+        "y": 255,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "b8fc2441.d8f338"\r
+                "66dbd2c2.e849f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8fc2441.d8f338",\r
+        "id": "66dbd2c2.e849f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 229.33324432373047,\r
-        "y": 284.0000581741333,\r
-        "z": "12466ca0.33d983",\r
+        "x": 295.33324432373047,\r
+        "y": 341.0000581741333,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "92076785.102998"\r
+                "9fd2e6b.eda7a18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1481334b.aa109d",\r
+        "id": "61a5fd01.4ba864",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 513.2326469421387,\r
-        "y": 369.0103905200958,\r
-        "z": "12466ca0.33d983",\r
+        "x": 579.2326469421387,\r
+        "y": 426.0103905200958,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "397c4a4d.4ed016",\r
-                "2bdd888b.6d1ef8",\r
-                "595a4395.a6883c",\r
-                "ea4e21ab.628e5"\r
+                "5dbf7bde.42db34",\r
+                "74aefc5a.45af6c",\r
+                "7bedb246.58597c",\r
+                "a67a2d36.3001e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "397c4a4d.4ed016",\r
+        "id": "5dbf7bde.42db34",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 733.7332763671875,\r
-        "y": 478.0107421875,\r
-        "z": "12466ca0.33d983",\r
+        "x": 799.7332763671875,\r
+        "y": 535.0107421875,\r
+        "z": "f05faea.fedcdd",\r
         "wires": []\r
     },\r
     {\r
-        "id": "595a4395.a6883c",\r
+        "id": "7bedb246.58597c",\r
         "type": "switchNode",\r
-        "name": "switch tpId",\r
-        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tpId'`\">\n",\r
+        "name": "switch tp-id",\r
+        "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tp-id'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 735.7326431274414,\r
-        "y": 296.01042914390564,\r
-        "z": "12466ca0.33d983",\r
+        "x": 801.7326431274414,\r
+        "y": 353.01042914390564,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "7907fc56.fc4374"\r
+                "2c679a4f.e5d4f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7907fc56.fc4374",\r
+        "id": "2c679a4f.e5d4f6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 910.7330360412598,\r
-        "y": 294.01051592826843,\r
-        "z": "12466ca0.33d983",\r
+        "x": 976.7330360412598,\r
+        "y": 351.01051592826843,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "6a4f5caf.0f6f14"\r
+                "8c700565.606b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a4f5caf.0f6f14",\r
+        "id": "8c700565.606b5",\r
         "type": "set",\r
-        "name": "set tpId",\r
-        "xml": "<set>\n<parameter name='prop.uni.tpId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
+        "name": "set tp-id",\r
+        "xml": "<set>\n<parameter name='prop.uni.tp-id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1085.7331199645996,\r
-        "y": 295.61056327819824,\r
-        "z": "12466ca0.33d983",\r
+        "x": 1151.7331199645996,\r
+        "y": 352.61056327819824,\r
+        "z": "f05faea.fedcdd",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2bdd888b.6d1ef8",\r
+        "id": "74aefc5a.45af6c",\r
         "type": "switchNode",\r
         "name": "switch id",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'id'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 719.7319984436035,\r
-        "y": 247.3970763683319,\r
-        "z": "12466ca0.33d983",\r
+        "x": 785.7319984436035,\r
+        "y": 304.3970763683319,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "7b22e7e.bf6e718"\r
+                "4134909c.9e2bb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b22e7e.bf6e718",\r
+        "id": "4134909c.9e2bb",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 911.7319221496582,\r
-        "y": 247.39708304405212,\r
-        "z": "12466ca0.33d983",\r
+        "x": 977.7319221496582,\r
+        "y": 304.3970830440521,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "ab2d859f.6acac8"\r
+                "9aa99334.9686f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab2d859f.6acac8",\r
+        "id": "9aa99334.9686f",\r
         "type": "set",\r
         "name": "set id",\r
         "xml": "<set>\n<parameter name='prop.uni.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1055.7321891784668,\r
-        "y": 246.99721121788025,\r
-        "z": "12466ca0.33d983",\r
+        "x": 1121.7321891784668,\r
+        "y": 303.99721121788025,\r
+        "z": "f05faea.fedcdd",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea4e21ab.628e5",\r
+        "id": "a67a2d36.3001e",\r
         "type": "switchNode",\r
         "name": "switch cVLAN",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'cVLAN'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 738,\r
-        "y": 374,\r
-        "z": "12466ca0.33d983",\r
+        "x": 804,\r
+        "y": 431,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "c123c0b4.3c868"\r
+                "acaffd98.694c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c123c0b4.3c868",\r
+        "id": "acaffd98.694c98",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 906,\r
-        "y": 371,\r
-        "z": "12466ca0.33d983",\r
+        "x": 972,\r
+        "y": 428,\r
+        "z": "f05faea.fedcdd",\r
         "wires": [\r
             [\r
-                "5bf6b706.8b8148"\r
+                "abb07b4b.b62dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5bf6b706.8b8148",\r
+        "id": "abb07b4b.b62dc8",\r
         "type": "set",\r
         "name": "set cVLAN",\r
         "xml": "<set>\n<parameter name='prop.uni.cVLAN' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1081.0000839233398,\r
-        "y": 372.6000473499298,\r
-        "z": "12466ca0.33d983",\r
+        "x": 1147.0000839233398,\r
+        "y": 429.6000473499298,\r
+        "z": "f05faea.fedcdd",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
index dd1ba06..95961a0 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "f06d79a.4f13a08",\r
+        "id": "c0a79856.b8a9a8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 120,\r
-        "y": 66,\r
-        "z": "62554968.e321b8",\r
+        "x": 129,\r
+        "y": 75,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "e698fb0d.22ccb"\r
+                "f23fb4.004e985"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e698fb0d.22ccb",\r
+        "id": "f23fb4.004e985",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,350 +22,346 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 251.2856903076172,\r
-        "y": 115.23810863494873,\r
-        "z": "62554968.e321b8",\r
+        "x": 260.2856903076172,\r
+        "y": 124.23810863494873,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "c77e5b12.74fa8"\r
+                "16bd01d7.cde55e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c77e5b12.74fa8",\r
+        "id": "16bd01d7.cde55e",\r
         "type": "method",\r
         "name": "method sotn-vf-operation-l2vpn-activate",\r
         "xml": "<method rpc='sotn-vf-operation-l2vpn-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 254.42861938476562,\r
-        "y": 200.00003242492676,\r
-        "z": "62554968.e321b8",\r
+        "x": 263.4286193847656,\r
+        "y": 209.00003242492676,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "dc8a4134.633b38"\r
+                "4bca7263.f9b50c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc8a4134.633b38",\r
+        "id": "4bca7263.f9b50c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 622.2380447387695,\r
-        "y": 414.66666814964265,\r
-        "z": "62554968.e321b8",\r
+        "x": 631.2380447387695,\r
+        "y": 423.66666814964265,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "6485c0f8.91ce08",\r
-                "a02d1e2f.e50b18",\r
-                "c0d6a6a1.052f28",\r
-                "aff44c8.fd218b",\r
-                "cdefed21.97b52",\r
-                "ef33383b.0eb5c8",\r
-                "6bb0bfe6.f5358"\r
+                "89ba9e4f.322f08",\r
+                "b6b036c1.4e053",\r
+                "a1814ef6.4e6ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6485c0f8.91ce08",\r
+        "id": "213a5120.a6687e",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Active",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",\r
         "comments": "",\r
-        "x": 1037.3850173950195,\r
-        "y": 601.6705513000488,\r
-        "z": "62554968.e321b8",\r
+        "x": 1046.3850173950195,\r
+        "y": 610.6705513000488,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a02d1e2f.e50b18",\r
+        "id": "89ba9e4f.322f08",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 957.5717086791992,\r
-        "y": 727.5970888137817,\r
-        "z": "62554968.e321b8",\r
+        "x": 966.5717086791992,\r
+        "y": 736.5970888137817,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0d6a6a1.052f28",\r
+        "id": "b6b036c1.4e053",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",\r
+        "xml": "<set>\n<!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->\n<!--<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />-->\n\n<parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vf-module-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />\n",\r
         "comments": "",\r
-        "x": 1043.571662902832,\r
-        "y": 549.5968055725098,\r
-        "z": "62554968.e321b8",\r
+        "x": 1052.571662902832,\r
+        "y": 558.5968055725098,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aff44c8.fd218b",\r
+        "id": "951505a8.4ab128",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1052.0000610351562,\r
-        "y": 304.00000545661896,\r
-        "z": "62554968.e321b8",\r
+        "x": 1061.0000610351562,\r
+        "y": 313.00000545661896,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "c419b86f.420228",\r
-                "5e5514b0.5b9124",\r
-                "dab73261.53c13"\r
+                "298b7800.074bc",\r
+                "302f9230.c82bc6",\r
+                "3ee80cd1.702c9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dab73261.53c13",\r
+        "id": "3ee80cd1.702c9c",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1310.9689559936523,\r
-        "y": 265.96876499336213,\r
-        "z": "62554968.e321b8",\r
+        "x": 1319.9689559936523,\r
+        "y": 274.96876499336213,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "ac6cfd44.a241c"\r
+                "bc487c7b.4684b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac6cfd44.a241c",\r
+        "id": "bc487c7b.4684b8",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1465.7778434753418,\r
-        "y": 284.88903352897614,\r
-        "z": "62554968.e321b8",\r
+        "x": 1474.7778434753418,\r
+        "y": 293.88903352897614,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c419b86f.420228",\r
+        "id": "298b7800.074bc",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1304.0000953674316,\r
-        "y": 305.00008651893586,\r
-        "z": "62554968.e321b8",\r
+        "x": 1313.0000953674316,\r
+        "y": 314.00008651893586,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "ac6cfd44.a241c"\r
+                "bc487c7b.4684b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e5514b0.5b9124",\r
+        "id": "302f9230.c82bc6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1297.000503540039,\r
-        "y": 338.0000903336331,\r
-        "z": "62554968.e321b8",\r
+        "x": 1306.000503540039,\r
+        "y": 347.0000903336331,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "639a074f.493e98"\r
+                "3aa4324.564e84e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "639a074f.493e98",\r
+        "id": "3aa4324.564e84e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1444.2700462341309,\r
-        "y": 338.55473539512604,\r
-        "z": "62554968.e321b8",\r
+        "x": 1453.2700462341309,\r
+        "y": 347.55473539512604,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "6fa946fa.ca1978"\r
+                "ea8cd4e1.da014"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fa946fa.ca1978",\r
+        "id": "ea8cd4e1.da014",\r
         "type": "for",\r
         "name": "for vidx..service-data.vnfs.vnf_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1690.2861633300781,\r
-        "y": 345.4286558357999,\r
-        "z": "62554968.e321b8",\r
+        "x": 1699.2861633300781,\r
+        "y": 354.4286558357999,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "154eb41a.640b64"\r
+                "6be80779.f9067"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "154eb41a.640b64",\r
+        "id": "6be80779.f9067",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1909.6357955932617,\r
-        "y": 344.9687359062955,\r
-        "z": "62554968.e321b8",\r
+        "x": 1918.6357955932617,\r
+        "y": 353.9687359062955,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "330022d0.830a2e"\r
+                "e37eb61b.35117"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "330022d0.830a2e",\r
+        "id": "e37eb61b.35117",\r
         "type": "switchNode",\r
         "name": "switch vnfid found",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
+        "xml": "<!--<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">-->\n\n<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vf-topology-operation-input.vf-module-information.vf-module-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2063.7153930664062,\r
-        "y": 344.67881796043366,\r
-        "z": "62554968.e321b8",\r
+        "x": 2072.7153930664062,\r
+        "y": 353.67881796043366,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "fcbe4c85.417af"\r
+                "b5cfadba.1f4aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcbe4c85.417af",\r
+        "id": "b5cfadba.1f4aa",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2239.6675148010254,\r
-        "y": 344.57150003593415,\r
-        "z": "62554968.e321b8",\r
+        "x": 2248.6675148010254,\r
+        "y": 353.57150003593415,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "2fb9529b.c7be6e"\r
+                "bd36402c.584f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fb9529b.c7be6e",\r
+        "id": "bd36402c.584f38",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
         "comments": "",\r
-        "x": 2449.1998901367188,\r
-        "y": 346.3216001717374,\r
-        "z": "62554968.e321b8",\r
+        "x": 2458.1998901367188,\r
+        "y": 355.3216001717374,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cdefed21.97b52",\r
+        "id": "a1814ef6.4e6ba",\r
         "type": "save",\r
         "name": "update AnAI - l2vpn.operational-status",\r
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey=\"connectivity.connectivity-id = $vnfId\" >\n<parameter name=\"operational-status\" value=\"Active\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1063.0000228881836,\r
-        "y": 668.0103769302368,\r
-        "z": "62554968.e321b8",\r
+        "x": 1072.0000228881836,\r
+        "y": 677.0103769302368,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ef33383b.0eb5c8",\r
+        "id": "fa4a7cef.4c643",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
         "comments": "",\r
-        "x": 1042.0001373291016,\r
-        "y": 499.010338306427,\r
-        "z": "62554968.e321b8",\r
+        "x": 1051.0001373291016,\r
+        "y": 508.010338306427,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6bb0bfe6.f5358",\r
+        "id": "d491e887.81b538",\r
         "type": "switchNode",\r
         "name": "switch vnf-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1028.75,\r
-        "y": 404.00390815734863,\r
-        "z": "62554968.e321b8",\r
+        "x": 1037.75,\r
+        "y": 413.00390815734863,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "5c7bc43a.bb701c",\r
-                "b67194e3.094198"\r
+                "2e735695.8a522a",\r
+                "9667f59f.7676c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c7bc43a.bb701c",\r
+        "id": "2e735695.8a522a",\r
         "type": "outcome",\r
         "name": "outcome Created",\r
         "xml": "<outcome value='Created'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1274.583293914795,\r
-        "y": 405.1150059700012,\r
-        "z": "62554968.e321b8",\r
+        "x": 1283.583293914795,\r
+        "y": 414.1150059700012,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "914253cd.1c469"\r
+                "a29cc418.229998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b67194e3.094198",\r
+        "id": "9667f59f.7676c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1252.5833129882812,\r
-        "y": 455.115017414093,\r
-        "z": "62554968.e321b8",\r
+        "x": 1261.5833129882812,\r
+        "y": 464.115017414093,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             [\r
-                "b6453bfb.a302f"\r
+                "aa583cbc.e62958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6453bfb.a302f",\r
+        "id": "aa583cbc.e62958",\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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
         "comments": "",\r
-        "x": 1412.083080291748,\r
-        "y": 458.1150164604187,\r
-        "z": "62554968.e321b8",\r
+        "x": 1421.083080291748,\r
+        "y": 467.1150164604187,\r
+        "z": "498236f1.856f48",\r
         "wires": []\r
     },\r
     {\r
-        "id": "914253cd.1c469",\r
+        "id": "a29cc418.229998",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1484.8896675109863,\r
-        "y": 416.4401812553406,\r
-        "z": "62554968.e321b8",\r
+        "x": 1493.8896675109863,\r
+        "y": 425.4401812553406,\r
+        "z": "498236f1.856f48",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
index 951a18f..1f85f4c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
@@ -1,20 +1,35 @@
 [\r
     {\r
-        "id": "ed294889.e18cd8",\r
-        "type": "dgstart",\r
-        "name": "DGSTART",\r
+        "id": "7b71bd92.fd2814",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 117,\r
-        "y": 57,\r
-        "z": "a8db409e.810378",\r
+        "x": 459,\r
+        "y": 325.0000009536743,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "d573cd56.a0362"\r
+                "cd94e5aa.ecbb7",\r
+                "2023e2ef.c2aaae",\r
+                "b67caacf.835018",\r
+                "dc45507c.2c758",\r
+                "404d2254.b54cb4",\r
+                "f8f7ecd5.33f1b",\r
+                "192e11b1.7d71e6",\r
+                "a92fbbfb.a65698",\r
+                "19fc51d8.0cda46",\r
+                "14342bec.b0bb44",\r
+                "eaf312a9.dac698",\r
+                "657f9098.60c5e8",\r
+                "d49f5116.ef68d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d573cd56.a0362",\r
+        "id": "9fc16420.cc4ed8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,466 +37,511 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 248.2856903076172,\r
-        "y": 106.23810863494873,\r
-        "z": "a8db409e.810378",\r
+        "x": 301.00001525878906,\r
+        "y": 108.99999237060547,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "ab294e07.a9e7f"\r
+                "5abbcf9c.c62d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab294e07.a9e7f",\r
+        "id": "5abbcf9c.c62d48",\r
         "type": "method",\r
-        "name": "method sotn-vf-operation-l2vpn-create",\r
+        "name": "sotn-vf-operation-l2vpn-create",\r
         "xml": "<method rpc='sotn-vf-operation-l2vpn-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 251.42861938476562,\r
-        "y": 191.00003242492676,\r
-        "z": "a8db409e.810378",\r
+        "x": 300.00001525878906,\r
+        "y": 208.99999237060547,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "3b2ee2be.0d5776"\r
+                "7b71bd92.fd2814"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b2ee2be.0d5776",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "ad2ea8c5.fcd77",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 664.2380447387695,\r
-        "y": 394.6666717529297,\r
-        "z": "a8db409e.810378",\r
+        "x": 130.50001525878906,\r
+        "y": 20,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "7075470e.ead518",\r
-                "a887fb8.23d1908",\r
-                "c96cd735.589ad8",\r
-                "6d0e8b42.1f8964",\r
-                "49bfb25c.1c60ac",\r
-                "3b8acefc.66b31a",\r
-                "6eb961ad.5ae338",\r
-                "adbadf0e.275b3",\r
-                "c0c21f0e.1b5958",\r
-                "f1922be.86c2058",\r
-                "d0ca9568.fe847",\r
-                "5bbdffcc.b3f3b8"\r
+                "9fc16420.cc4ed8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a887fb8.23d1908",\r
-        "type": "set",\r
-        "name": "set vnf-level-oper-status to Created",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
+        "id": "2023e2ef.c2aaae",\r
+        "type": "for",\r
+        "name": "for loop idx - VF input parameters",\r
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
-        "x": 1086.3848571777344,\r
-        "y": 758.6706044944003,\r
-        "z": "a8db409e.810378",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 834.2502317428589,\r
+        "y": 333.66668009757996,\r
+        "z": "8baeaca1.28233",\r
+        "wires": [\r
+            [\r
+                "cf0ba013.1e08c8"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "7075470e.ead518",\r
-        "type": "set",\r
-        "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
+        "id": "cf0ba013.1e08c8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
-        "x": 1078.2380447387695,\r
-        "y": 653.6668565543368,\r
-        "z": "a8db409e.810378",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 1049.0285749435425,\r
+        "y": 331.2222640514374,\r
+        "z": "8baeaca1.28233",\r
+        "wires": [\r
+            [\r
+                "38f94a22.124166",\r
+                "7ae6315a.90c6e8"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "49bfb25c.1c60ac",\r
+        "id": "38f94a22.124166",\r
         "type": "execute",\r
-        "name": "execute generate-vnf-index",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-id\"/>\n",\r
+        "name": "execute split parameterName",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1066.571548461914,\r
-        "y": 603.3334405692294,\r
-        "z": "a8db409e.810378",\r
+        "x": 1245.2847776412964,\r
+        "y": 308.97040247917175,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c0c21f0e.1b5958",\r
+        "id": "7ae6315a.90c6e8",\r
         "type": "set",\r
-        "name": "set vnf-index to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",\r
+        "name": "set parameterName",\r
+        "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
+        "comments": "",\r
+        "x": 1214.7292051315308,\r
+        "y": 345.97051882743835,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5639a33f.aee984",\r
+        "type": "comment",\r
+        "name": "Take the parameter names by removing prefix",\r
+        "info": "",\r
         "comments": "",\r
-        "x": 1077.5716247558594,\r
-        "y": 710.3334443839267,\r
-        "z": "a8db409e.810378",\r
+        "x": 1218.250433921814,\r
+        "y": 268.33334851264954,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c96cd735.589ad8",\r
+        "id": "cd94e5aa.ecbb7",\r
         "type": "switchNode",\r
-        "name": "switch service-data.vnfs.vnf_length",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
+        "name": "switch vf-modules.vf-module_length",\r
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1093.5713653564453,\r
-        "y": 273.3333633216098,\r
-        "z": "a8db409e.810378",\r
+        "x": 816.0000305175781,\r
+        "y": 187.00001692771912,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "9138e1fa.f1d37",\r
-                "bf45ff7d.c852e"\r
+                "543dc8c7.d54a4",\r
+                "7bbfeaa9.0bd62c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9138e1fa.f1d37",\r
+        "id": "543dc8c7.d54a4",\r
         "type": "other",\r
-        "name": "NULL",\r
+        "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1328.2857513427734,\r
-        "y": 268.47618367988616,\r
-        "z": "a8db409e.810378",\r
+        "x": 1047.0000410079956,\r
+        "y": 163.00001406669617,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "4dbced61.ca9034"\r
+                "be09761b.de8e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4dbced61.ca9034",\r
-        "type": "set",\r
-        "name": "set vnf-index=0",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
-        "comments": "",\r
-        "x": 1488.5714569091797,\r
-        "y": 268.47627523262054,\r
-        "z": "a8db409e.810378",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "bf45ff7d.c852e",\r
+        "id": "7bbfeaa9.0bd62c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1324.7142906188965,\r
-        "y": 301.7620151313022,\r
-        "z": "a8db409e.810378",\r
+        "x": 1047.0000410079956,\r
+        "y": 203.00001406669617,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "dbddb28c.bce1e8"\r
+                "655e11f8.e1faa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33a0ff35.932e78",\r
+        "id": "be09761b.de8e3",\r
         "type": "set",\r
-        "name": "set vnf-index = vnf_length",\r
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
+        "name": "set vf-index",\r
+        "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1717.571533203125,\r
-        "y": 280.0477407248691,\r
-        "z": "a8db409e.810378",\r
+        "x": 1189.5000410079956,\r
+        "y": 163.00001406669617,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36e21bba.2e2ef4",\r
-        "type": "for",\r
-        "name": "for each existing VNF",\r
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
+        "id": "655e11f8.e1faa8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1706.0001525878906,\r
-        "y": 315.04771259147674,\r
-        "z": "a8db409e.810378",\r
+        "x": 1191.3570852279663,\r
+        "y": 202.93652606010437,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "7dde789c.f76928"\r
+                "4b883294.d65484",\r
+                "b58a8196.c8fd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbddb28c.bce1e8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "id": "b58a8196.c8fd18",\r
+        "type": "set",\r
+        "name": "set vf-index",\r
+        "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
+        "comments": "",\r
+        "x": 1344.0555601119995,\r
+        "y": 172.5556247527711,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4b883294.d65484",\r
+        "type": "for",\r
+        "name": "for each existing vf-index",\r
+        "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1459.4285736083984,\r
-        "y": 303.76198461372405,\r
-        "z": "a8db409e.810378",\r
+        "x": 1400.4840650558472,\r
+        "y": 225.7777545452118,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "33a0ff35.932e78",\r
-                "36e21bba.2e2ef4"\r
+                "46919469.ed5074"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dde789c.f76928",\r
+        "id": "23d12f2a.b840a8",\r
+        "type": "comment",\r
+        "name": "make sure this network doesn't exist already",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1624.1347951889038,\r
+        "y": 184.03181195259094,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "46919469.ed5074",\r
         "type": "switchNode",\r
-        "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
+        "name": "switch vf-module-id found",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2099.285888671875,\r
-        "y": 315.61919668037444,\r
-        "z": "a8db409e.810378",\r
+        "x": 1675.7697858810425,\r
+        "y": 225.34925723075867,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "5924827c.34c2fc"\r
+                "9a5788e3.06116"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5924827c.34c2fc",\r
+        "id": "9a5788e3.06116",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2380.571590423584,\r
-        "y": 314.19060209114105,\r
-        "z": "a8db409e.810378",\r
+        "x": 1576.4999837875366,\r
+        "y": 283.9206883907318,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "46ba128f.50acd4"\r
+                "1914f90.a238b87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88b8e912.2900e8",\r
-        "type": "comment",\r
-        "name": "make sure this vnf-id doesn't exist already",\r
-        "info": "",\r
+        "id": "1914f90.a238b87",\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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 2068.4285049438477,\r
-        "y": 279.1905887397006,\r
-        "z": "a8db409e.810378",\r
+        "x": 1724.2500867843628,\r
+        "y": 283.7778804595582,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d0e8b42.1f8964",\r
+        "id": "f8f7ecd5.33f1b",\r
         "type": "set",\r
-        "name": "set new vnf_length",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
+        "name": "copy input data to service data",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n<!--<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />-->\n\n\n\n",\r
         "comments": "",\r
-        "x": 1038.571548461914,\r
-        "y": 551.3334372313693,\r
-        "z": "a8db409e.810378",\r
+        "x": 829.8532209396362,\r
+        "y": 636.4962680339813,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b8acefc.66b31a",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
+        "id": "404d2254.b54cb4",\r
+        "type": "execute",\r
+        "name": "execute generate-vf-module-index",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-vf-index\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 841.1867933273315,\r
+        "y": 589.1629703044891,\r
+        "z": "8baeaca1.28233",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc45507c.2c758",\r
+        "type": "set",\r
+        "name": "set new vf-module_length",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 1025.5715103149414,\r
-        "y": 1021.5969560416415,\r
-        "z": "a8db409e.810378",\r
+        "x": 813.1868543624878,\r
+        "y": 540.1629703044891,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6eb961ad.5ae338",\r
+        "id": "b67caacf.835018",\r
         "type": "set",\r
-        "name": "set vnf-index and vnf-object-path",\r
-        "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",\r
+        "name": "set vf-module-request-input.",\r
+        "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 1079.5715408325195,\r
-        "y": 799.5968749793246,\r
-        "z": "a8db409e.810378",\r
+        "x": 813.1863813400269,\r
+        "y": 486.15425848960876,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46ba128f.50acd4",\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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
+        "id": "192e11b1.7d71e6",\r
+        "type": "set",\r
+        "name": "set vf-module-level-oper-status",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",\r
         "comments": "",\r
-        "x": 2509.1429595947266,\r
-        "y": 365.1906163962558,\r
-        "z": "a8db409e.810378",\r
+        "x": 823.5002088546753,\r
+        "y": 734.0000891089439,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adbadf0e.275b3",\r
+        "id": "eaf312a9.dac698",\r
         "type": "save",\r
-        "name": "save AnAI - l2vpn.operational-status",\r
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"   \n\t\tkey='connectivity.connectivity-id = $prop.connectivity-id' >\n<parameter name=\"operational-status\" value=\"Created\" />\n",\r
+        "name": "save connectivity resource in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.vpn-vf-index'>\n<parameter name='connectivity-id' value='`$prop.vpn-vf-index`' />\n<parameter name='operational-status' value='Created' />\n\n\n<!--<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />-->\n<!--<parameter name='sdwan-vpn-name' value='`$prop.name`' />-->\n<!--<parameter name='topology' value='`$prop.topology`' />-->\n<!--<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />-->\n<!--<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` \" />-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1134.5458450317383,\r
-        "y": 909.247092035599,\r
-        "z": "a8db409e.810378",\r
+        "x": 830.0000696182251,\r
+        "y": 779.5000369548798,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "204db5a4.c326da",\r
-        "type": "comment",\r
-        "name": "TODO: change AAI models",\r
-        "info": "",\r
+        "id": "a92fbbfb.a65698",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 1068.1821060180664,\r
-        "y": 868.9743078025058,\r
-        "z": "a8db409e.810378",\r
+        "x": 777.7225427627563,\r
+        "y": 872.6739275455475,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e76c21c2.4a838",\r
-        "type": "execute",\r
-        "name": "execute split parameterName",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
+        "id": "19fc51d8.0cda46",\r
+        "type": "for",\r
+        "name": "for loop i - Network input parameters",\r
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1494.7395935058594,\r
-        "y": 362.7500076564029,\r
-        "z": "a8db409e.810378",\r
+        "x": 841.2539472579956,\r
+        "y": 422.5039279460907,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
-            []\r
+            [\r
+                "757b8d75.3d0a94"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "11945653.6c33ba",\r
+        "id": "757b8d75.3d0a94",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1298.4833908081055,\r
-        "y": 367.0018806727603,\r
-        "z": "a8db409e.810378",\r
+        "x": 1128.476824760437,\r
+        "y": 422.7262418270111,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "e76c21c2.4a838",\r
-                "e0fb04c6.a15c88"\r
+                "8a7ad1b3.ba99a8",\r
+                "597f978e.f5f578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1922be.86c2058",\r
-        "type": "for",\r
-        "name": "for loop idx - VNF input parameters",\r
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
+        "id": "8a7ad1b3.ba99a8",\r
+        "type": "switchNode",\r
+        "name": "switch name",\r
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1083.7050476074219,\r
-        "y": 369.4462967189029,\r
-        "z": "a8db409e.810378",\r
+        "x": 1316.6986684799194,\r
+        "y": 405.05954599380493,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "11945653.6c33ba"\r
+                "f3762745.5848d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0ca9568.fe847",\r
-        "type": "set",\r
-        "name": "set vnf-request-input.",\r
-        "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
-        "comments": "",\r
-        "x": 1040.7046813964844,\r
-        "y": 439.7710037501529,\r
-        "z": "a8db409e.810378",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "e0fb04c6.a15c88",\r
-        "type": "set",\r
-        "name": "set parameterName",\r
-        "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
-        "comments": "",\r
-        "x": 1471.7395935058594,\r
-        "y": 408.7500076564029,\r
-        "z": "a8db409e.810378",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "5bbdffcc.b3f3b8",\r
-        "type": "for",\r
-        "name": "for each sdwan-get-request-input-param",\r
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
+        "id": "597f978e.f5f578",\r
+        "type": "switchNode",\r
+        "name": "switch topology",\r
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1096.7395935058594,\r
-        "y": 491.7500076564029,\r
-        "z": "a8db409e.810378",\r
+        "x": 1327.5383291244507,\r
+        "y": 445.0595440864563,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "e0f56e7c.d34a1"\r
+                "751a61f6.1024c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0f56e7c.d34a1",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "id": "f3762745.5848d8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1322.9722595214844,\r
-        "y": 490.0937576564029,\r
-        "z": "a8db409e.810378",\r
+        "x": 1503.6986684799194,\r
+        "y": 401.05954599380493,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "5be518f3.e26978"\r
+                "254d198b.dac90e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5be518f3.e26978",\r
-        "type": "switchNode",\r
-        "name": "switch vnf name",\r
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",\r
+        "id": "751a61f6.1024c8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1479.4722595214844,\r
-        "y": 488.09381869155914,\r
-        "z": "a8db409e.810378",\r
+        "x": 1497.5383291244507,\r
+        "y": 441.0595440864563,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
             [\r
-                "3bfa8dc2.ee3a5a"\r
+                "bd2b112e.cf89f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bfa8dc2.ee3a5a",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
+        "id": "254d198b.dac90e",\r
+        "type": "set",\r
+        "name": "set name",\r
+        "xml": "<set>\n<parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n\n",\r
+        "comments": "",\r
+        "x": 1653.6987981796265,\r
+        "y": 399.6595525741577,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bd2b112e.cf89f",\r
+        "type": "set",\r
+        "name": "set topology",\r
+        "xml": "<set>\n<parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
+        "comments": "",\r
+        "x": 1684.8717699050903,\r
+        "y": 439.5207009315491,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "14342bec.b0bb44",\r
+        "type": "set",\r
+        "name": "set vf-module-object-path",\r
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vpn-vf-index\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
+        "comments": "",\r
+        "x": 815.5000867843628,\r
+        "y": 685.0313085913658,\r
+        "z": "8baeaca1.28233",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "657f9098.60c5e8",\r
+        "type": "save",\r
+        "name": "save service relationship in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $vf-module-topology-operation-input.vnf-information.vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.vpn-vf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vpn-vf-index`\" />\n\n<!--key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1640.4726257324219,\r
-        "y": 488.0938797267154,\r
-        "z": "a8db409e.810378",\r
+        "x": 830.000147819519,\r
+        "y": 827.0001780986786,\r
+        "z": "8baeaca1.28233",\r
         "wires": [\r
-            [\r
-                "5f201fd1.6acc3"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "5f201fd1.6acc3",\r
+        "id": "d49f5116.ef68d8",\r
         "type": "set",\r
-        "name": "set vnf name",\r
-        "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",\r
+        "name": "set vnf-index",\r
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n\n\n",\r
         "comments": "",\r
-        "x": 1798.4727478027344,\r
-        "y": 486.69391634780914,\r
-        "z": "a8db409e.810378",\r
+        "x": 739,\r
+        "y": 124,\r
+        "z": "8baeaca1.28233",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
index b864697..658a04c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "ea193d8f.e165e",\r
+        "id": "7a5b2247.76a96c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 112,\r
-        "y": 70,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 115,\r
+        "y": 61,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "45143e5e.12cef"\r
+                "8f393b9e.9e17b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45143e5e.12cef",\r
+        "id": "8f393b9e.9e17b",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,1333 +22,1342 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 243.2856903076172,\r
-        "y": 119.23810863494873,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 246.2856903076172,\r
+        "y": 110.23810863494873,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "22fb039d.719e1c"\r
+                "eff67602.0d4e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22fb039d.719e1c",\r
+        "id": "eff67602.0d4e4",\r
         "type": "method",\r
         "name": "method sotn-vf-operation-uni-activate",\r
         "xml": "<method rpc='sotn-vf-operation-uni-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 246.42861938476562,\r
-        "y": 204.00003242492676,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 249.42861938476562,\r
+        "y": 195.00003242492676,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "bbe79441.cda0b"\r
+                "c03d71cc.6719d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8dca40ca.b6cbc8",\r
+        "id": "b1251334.94c658",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 718.9959564208984,\r
-        "y": 384.99998915195465,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 721.9959564208984,\r
+        "y": 375.99998915195465,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "66f88853.0801a8",\r
-                "5f34a2a5.ce0fbc",\r
-                "37779f9b.3e84f8"\r
+                "2185890c.41cf5e",\r
+                "7887ee8e.f7ad9",\r
+                "bf0b3d3b.de1c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbe79441.cda0b",\r
+        "id": "c03d71cc.6719d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 337.6626205444336,\r
-        "y": 489.66670763492584,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 340.6626205444336,\r
+        "y": 480.66670763492584,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8dca40ca.b6cbc8",\r
-                "b28368bd.88b17",\r
-                "91b62864.f184c8",\r
-                "b0f3fc53.5db61",\r
-                "b5422f78.9d3e4",\r
-                "f2975c47.fb694",\r
-                "aeddedc2.f06158",\r
-                "5950f717.b81e28"\r
+                "b1251334.94c658",\r
+                "e40d5cd3.6df488",\r
+                "77bef901.3c81f",\r
+                "f1780b76.81d518",\r
+                "5733466d.dcbb88",\r
+                "6d51d616.88647",\r
+                "aab160b4.f76088",\r
+                "48dc3a93.b23a44",\r
+                "672fc75a.1e91b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91b62864.f184c8",\r
+        "id": "77bef901.3c81f",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 684.0273170471191,\r
-        "y": 255.269144654274,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 687.0273170471191,\r
+        "y": 246.269144654274,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "3d5e06d8.9791c2"\r
+                "c9d21017.2aa0b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b28368bd.88b17",\r
+        "id": "e40d5cd3.6df488",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 688.9959716796875,\r
-        "y": 194.00001394748688,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 691.9959716796875,\r
+        "y": 185.00001394748688,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "746b74df.fbc48c"\r
+                "eb024dbb.2172c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "746b74df.fbc48c",\r
+        "id": "eb024dbb.2172c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868.9959526062012,\r
-        "y": 193.0000034570694,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 871.9959526062012,\r
+        "y": 184.0000034570694,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "62ebea71.fce5b4"\r
+                "9467f8cc.185d38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62ebea71.fce5b4",\r
+        "id": "9467f8cc.185d38",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1018.4246788024902,\r
-        "y": 194.14292109012604,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1021.4246788024902,\r
+        "y": 185.14292109012604,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d5e06d8.9791c2",\r
+        "id": "c9d21017.2aa0b8",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 906.9959678649902,\r
-        "y": 256.00000965595245,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 909.9959678649902,\r
+        "y": 247.00000965595245,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "fccff52.827ec08"\r
+                "5eb86cb5.aa0e34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fccff52.827ec08",\r
+        "id": "5eb86cb5.aa0e34",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1121.9959526062012,\r
-        "y": 254.0000034570694,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1124.9959526062012,\r
+        "y": 245.0000034570694,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "fc0c6263.7f4b58"\r
+                "eb010427.42f398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46df70e6.cbb32",\r
+        "id": "8fe487a9.faab98",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1462.9959716796875,\r
-        "y": 222,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1465.9959716796875,\r
+        "y": 213,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f34a2a5.ce0fbc",\r
+        "id": "7887ee8e.f7ad9",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.9959716796875,\r
-        "y": 409,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 981.9959716796875,\r
+        "y": 400,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "b65ac05a.92d3b8"\r
+                "6182e795.96a958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66f88853.0801a8",\r
+        "id": "2185890c.41cf5e",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.9959716796875,\r
-        "y": 337,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 978.9959716796875,\r
+        "y": 328,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "b65ac05a.92d3b8"\r
+                "6182e795.96a958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b65ac05a.92d3b8",\r
+        "id": "6182e795.96a958",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1147.9959716796875,\r
-        "y": 371,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1150.9959716796875,\r
+        "y": 362,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37779f9b.3e84f8",\r
+        "id": "bf0b3d3b.de1c1",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 940.9959487915039,\r
-        "y": 479.9999986886978,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 943.9959487915039,\r
+        "y": 470.9999986886978,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8619e619.b5b6f"\r
+                "f14d9e8b.d52ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4807db5.ce3f18",\r
+        "id": "13dbecad.5f9583",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1294.995964050293,\r
-        "y": 478.0000126361847,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1297.995964050293,\r
+        "y": 469.0000126361847,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8619e619.b5b6f",\r
+        "id": "f14d9e8b.d52ee8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1101.995994567871,\r
-        "y": 476.99999010562897,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1104.995994567871,\r
+        "y": 467.99999010562897,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "b4807db5.ce3f18",\r
-                "b7112b63.fa666"\r
+                "13dbecad.5f9583",\r
+                "76e7a061.215fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7112b63.fa666",\r
+        "id": "76e7a061.215fe",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1313.9959335327148,\r
-        "y": 530.9999891519547,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1316.9959335327148,\r
+        "y": 521.9999891519547,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "207d79b0.f0396e"\r
+                "4d4229cc.870928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "207d79b0.f0396e",\r
+        "id": "4d4229cc.870928",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1556.995948791504,\r
-        "y": 525.9999986886978,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1559.995948791504,\r
+        "y": 516.9999986886978,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "f2b976ec.55b34"\r
+                "235f500c.adb2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2b976ec.55b34",\r
+        "id": "235f500c.adb2d8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1754.9959774017334,\r
-        "y": 513.000005364418,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1757.9959774017334,\r
+        "y": 504.00000536441803,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "eab205c1.ee7e8"\r
+                "b98c0673.7d62f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eab205c1.ee7e8",\r
+        "id": "b98c0673.7d62f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1906.995948791504,\r
-        "y": 514.9999986886978,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1909.995948791504,\r
+        "y": 505.9999986886978,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "7cce5705.9b51",\r
-                "b161a727.31db88",\r
-                "8cc64f67.5de4c"\r
+                "9c359698.db3d68",\r
+                "1962516c.e21167"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cce5705.9b51",\r
+        "id": "9c359698.db3d68",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2134.996063232422,\r
-        "y": 457.0000025033951,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2137.996063232422,\r
+        "y": 448.0000025033951,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b161a727.31db88",\r
+        "id": "1962516c.e21167",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2138.996063232422,\r
-        "y": 511.0000025033951,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2141.996063232422,\r
+        "y": 502.0000025033951,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0f3fc53.5db61",\r
+        "id": "f1780b76.81d518",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 612.9961547851562,\r
-        "y": 1684.501220703125,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 615.9961547851562,\r
+        "y": 1675.501220703125,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cc64f67.5de4c",\r
+        "id": "29a9aeb.30d1952",\r
         "type": "call",\r
         "name": "call sotn-get-vf-module-uni-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2169.45108795166,\r
-        "y": 562.0104948282242,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2172.45108795166,\r
+        "y": 553.0104948282242,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b5422f78.9d3e4",\r
+        "id": "5733466d.dcbb88",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 698.9959564208984,\r
-        "y": 324.5039049386978,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 701.9959564208984,\r
+        "y": 315.5039049386978,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc0c6263.7f4b58",\r
+        "id": "eb010427.42f398",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1285,\r
-        "y": 264,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1288,\r
+        "y": 255,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "46df70e6.cbb32",\r
-                "868e2384.9bd088"\r
+                "8fe487a9.faab98",\r
+                "c2b0533e.d5b1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "868e2384.9bd088",\r
+        "id": "c2b0533e.d5b1d",\r
         "type": "set",\r
         "name": "set tmp.vnf-id",\r
         "xml": "<set>\n<parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 1470,\r
-        "y": 279,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1473,\r
+        "y": 270,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5950f717.b81e28",\r
+        "id": "48dc3a93.b23a44",\r
         "type": "get-resource",\r
         "name": "get-resource generic-vnf",\r
-        "xml": "<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' >\n\n\n",\r
+        "xml": "<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        pfx='tmp.aai.generic-vnf' local-only='false' >\n\n<!--AND depth = '0'\"-->\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 591,\r
-        "y": 543,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 594,\r
+        "y": 534,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "25602afb.1d9cfe"\r
+                "28391a2c.3321fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8bfca5dd.ccec38",\r
+        "id": "6a811cc0.b174ac",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 821,\r
-        "y": 591,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 824,\r
+        "y": 582,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "3fb86113.9bfd2e",\r
-                "cea6f99d.9fa3f8"\r
+                "1afc6101.b3a3ff",\r
+                "6ac23f85.2f3a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cea6f99d.9fa3f8",\r
+        "id": "6ac23f85.2f3a38",\r
         "type": "for",\r
         "name": "for each relationship in gen-vnf",\r
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1033,\r
-        "y": 594,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1036,\r
+        "y": 585,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "380b3b11.1fc39c"\r
+                "5e0bc542.fea784"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "380b3b11.1fc39c",\r
+        "id": "5e0bc542.fea784",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
-        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
+        "xml": "<switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1259,\r
-        "y": 598,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1262,\r
+        "y": 589,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "6ce242f7.50a224"\r
+                "ad3f5adb.0bf5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ce242f7.50a224",\r
+        "id": "ad3f5adb.0bf5b8",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1448.285888671875,\r
-        "y": 606.82177734375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1451.285888671875,\r
+        "y": 597.82177734375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8f0c299e.76aa68"\r
+                "4a0655ab.fa2fa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f0c299e.76aa68",\r
+        "id": "4a0655ab.fa2fa4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1623.117431640625,\r
-        "y": 609.3402709960938,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1626.117431640625,\r
+        "y": 600.3402709960938,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "9cc6d571.b014d8",\r
-                "8d29ebb2.4924b",\r
-                "1b814ca6.da0c53"\r
+                "2cd069f4.1bd85e",\r
+                "e85654b4.901fd",\r
+                "596112fe.dbc0a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cc6d571.b014d8",\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",\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
         "comments": "",\r
-        "x": 1840.117431640625,\r
-        "y": 607.3402709960938,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1843.117431640625,\r
+        "y": 598.3402709960938,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3fb86113.9bfd2e",\r
+        "id": "1afc6101.b3a3ff",\r
         "type": "switchNode",\r
         "name": "switch number of unis  less than two",\r
         "xml": "<switch test='`$tmp.unis.uni_length &lt; 2`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1008,\r
-        "y": 758,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1011,\r
+        "y": 749,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "ca909120.1610f"\r
+                "3398154f.dabcca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6807aab1.3361f4",\r
+        "id": "f0dacaa2.3f6d9",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n\n",\r
         "comments": "",\r
-        "x": 1416,\r
-        "y": 760,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1419,\r
+        "y": 751,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca909120.1610f",\r
+        "id": "3398154f.dabcca",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1224,\r
-        "y": 759,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1227,\r
+        "y": 750,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "6807aab1.3361f4"\r
+                "f0dacaa2.3f6d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d29ebb2.4924b",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1879,\r
-        "y": 682,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1882,\r
+        "y": 673,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8df25e56.70ef2",\r
-                "5281d33f.6cf23c"\r
+                "fb92d303.a6d858",\r
+                "3b07d667.72d91a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5281d33f.6cf23c",\r
+        "id": "3b07d667.72d91a",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2102,\r
-        "y": 637,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2105,\r
+        "y": 628,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "98c7bac7.1f7b2"\r
+                "9111f685.17b2e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8df25e56.70ef2",\r
+        "id": "fb92d303.a6d858",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2104,\r
-        "y": 701,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2107,\r
+        "y": 692,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "538dd561.19c994"\r
+                "1432f6d2.d75751"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98c7bac7.1f7b2",\r
+        "id": "9111f685.17b2e8",\r
         "type": "set",\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": 2324,\r
-        "y": 639,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2327,\r
+        "y": 630,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "538dd561.19c994",\r
+        "id": "1432f6d2.d75751",\r
         "type": "returnFailure",\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": 2263,\r
-        "y": 720,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2266,\r
+        "y": 711,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b814ca6.da0c53",\r
+        "id": "596112fe.dbc0a4",\r
         "type": "get-resource",\r
         "name": "get-resource pnf",\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": 1809,\r
-        "y": 819,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1812,\r
+        "y": 810,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "a9afb163.16d81"\r
+                "51c3744a.753414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d7469b.d065118",\r
+        "id": "796d1bdc.d65e9c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2168.88232421875,\r
-        "y": 827.6556396484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2171.88232421875,\r
+        "y": 818.6556396484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "d8ebfcdc.d7e228",\r
-                "e363b1ad.6cf518"\r
+                "9e81136f.40f158",\r
+                "3a607f75.56a9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8ebfcdc.d7e228",\r
+        "id": "9e81136f.40f158",\r
         "type": "set",\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": 2348,\r
-        "y": 781,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2351,\r
+        "y": 772,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e363b1ad.6cf518",\r
+        "id": "3a607f75.56a9d",\r
         "type": "for",\r
         "name": "for each relationship in pnf",\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": 2360.882568359375,\r
-        "y": 867.6597290039062,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2363.882568359375,\r
+        "y": 858.6597290039062,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "95c7940c.2b5948"\r
+                "709c4d83.a869b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95c7940c.2b5948",\r
+        "id": "709c4d83.a869b4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2586.882568359375,\r
-        "y": 867.6597290039062,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2589.882568359375,\r
+        "y": 858.6597290039062,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "a1776b53.b80d",\r
-                "af94fb8e.80dfb8"\r
+                "8cbba6bb.ad862",\r
+                "dd673476.c308f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af94fb8e.80dfb8",\r
+        "id": "dd673476.c308f",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2785,\r
-        "y": 980,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2788,\r
+        "y": 971,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "127afd4b.34da43"\r
+                "2c8cb3cb.28eeec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "127afd4b.34da43",\r
+        "id": "2c8cb3cb.28eeec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2998,\r
-        "y": 981,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3001,\r
+        "y": 972,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "9a33ae38.4ad288",\r
-                "b1e1b5aa.ff6b18"\r
+                "8af5221c.7c91b",\r
+                "47206fa6.e312e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a33ae38.4ad288",\r
+        "id": "8af5221c.7c91b",\r
         "type": "set",\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": 3233,\r
-        "y": 911,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3236,\r
+        "y": 902,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1e1b5aa.ff6b18",\r
+        "id": "47206fa6.e312e",\r
         "type": "get-resource",\r
         "name": "get-resource 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 = $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": 3241,\r
-        "y": 992,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3244,\r
+        "y": 983,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "7923986a.2dfdb"\r
+                "4ad04544.d0fad4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7923986a.2dfdb",\r
+        "id": "4ad04544.d0fad4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3473.5,\r
-        "y": 988,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3476.5,\r
+        "y": 979,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "e1de0e95.dce97"\r
+                "d8cca786.0614f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1de0e95.dce97",\r
+        "id": "d8cca786.0614f8",\r
         "type": "set",\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": 3742,\r
-        "y": 987,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3745,\r
+        "y": 978,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aeddedc2.f06158",\r
+        "id": "aab160b4.f76088",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797,\r
-        "y": 905,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 800,\r
+        "y": 896,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a1776b53.b80d",\r
+        "id": "8cbba6bb.ad862",\r
         "type": "outcome",\r
         "name": "thirdparty-controller",\r
         "xml": "<outcome value='thirdparty-controller'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2812,\r
-        "y": 845,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2815,\r
+        "y": 836,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "4c01f776.c87b7"\r
+                "8b43ac76.263cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c01f776.c87b7",\r
+        "id": "8b43ac76.263cd",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3025,\r
-        "y": 846,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3028,\r
+        "y": 837,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "583e9b05.f6eef4"\r
+                "9b5d5673.27be38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "583e9b05.f6eef4",\r
+        "id": "9b5d5673.27be38",\r
         "type": "set",\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": 3252,\r
-        "y": 845,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 3255,\r
+        "y": 836,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d059a84d.8e506",\r
+        "id": "4ddb604c.658b08",\r
         "type": "comment",\r
         "name": "when we reach here, we have 2 UNIs, so do ACTN operations",\r
         "info": "",\r
         "comments": "",\r
-        "x": 810,\r
-        "y": 851,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 813,\r
+        "y": 842,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2975c47.fb694",\r
+        "id": "6d51d616.88647",\r
         "type": "for",\r
         "name": "for vidx..unis.uni_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$tmp.unis.uni_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 663,\r
-        "y": 1097,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 666,\r
+        "y": 1088,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "de539d0a.26596"\r
+                "8a72c5de.69f39"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b0a5525.2ac102",\r
+        "id": "f7756434.d014e",\r
         "type": "set",\r
         "name": "set oof.vpn",\r
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",\r
         "comments": "",\r
-        "x": 1089.0272216796875,\r
-        "y": 1036.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1092.0272216796875,\r
+        "y": 1027.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29b92baa.41f5cc",\r
+        "id": "8e5c8d32.64abe8",\r
         "type": "set",\r
         "name": "set controller data",\r
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\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
-        "x": 1569.0272216796875,\r
-        "y": 1149.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1572.0272216796875,\r
+        "y": 1140.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82572a7a.757f1",\r
+        "id": "58b223b2.226b5c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1399.0272216796875,\r
-        "y": 1149.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1402.0272216796875,\r
+        "y": 1140.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "29b92baa.41f5cc"\r
+                "8e5c8d32.64abe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ff0b8e4.d0edd",\r
+        "id": "74cd1f0b.113038",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1403.0272216796875,\r
-        "y": 1189.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1406.0272216796875,\r
+        "y": 1180.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "d2605932.de72d8"\r
+                "50f33a59.7393a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcaaab5e.f760b",\r
+        "id": "4f39f2a5.5bd5fc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1395.0272216796875,\r
-        "y": 1229.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1398.0272216796875,\r
+        "y": 1220.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "c5af9444.32cba8"\r
+                "4b579e44.4ec6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2605932.de72d8",\r
+        "id": "50f33a59.7393a4",\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": 1553.0272216796875,\r
-        "y": 1189.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1556.0272216796875,\r
+        "y": 1180.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5af9444.32cba8",\r
+        "id": "4b579e44.4ec6b",\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": 1553.0272216796875,\r
-        "y": 1229.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1556.0272216796875,\r
+        "y": 1220.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc15d354.485648",\r
+        "id": "66a971fa.46a568",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1399.0272216796875,\r
-        "y": 1269.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1402.0272216796875,\r
+        "y": 1260.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "189365cc.5aa2da"\r
+                "9aeb59cf.e4f488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36cada17.d60606",\r
+        "id": "3bf26416.4deddc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1395.0272216796875,\r
-        "y": 1309.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1398.0272216796875,\r
+        "y": 1300.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "436f764c.14ed4"\r
+                "e227ce38.6755d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "436f764c.14ed4",\r
+        "id": "e227ce38.6755d",\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=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1553.0272216796875,\r
-        "y": 1309.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1556.0272216796875,\r
+        "y": 1300.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "189365cc.5aa2da",\r
+        "id": "9aeb59cf.e4f488",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1549.5272216796875,\r
-        "y": 1269.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1552.5272216796875,\r
+        "y": 1260.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bce6bff8.ae1f18",\r
+        "id": "ac6d44a1.0c401",\r
         "type": "comment",\r
         "name": "Get controller info and send request",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1161.0272216796875,\r
-        "y": 1149.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1164.0272216796875,\r
+        "y": 1140.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c2f104c.2ab35",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1153.0272216796875,\r
-        "y": 1189.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1156.0272216796875,\r
+        "y": 1180.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "82572a7a.757f1",\r
-                "7ff0b8e4.d0edd",\r
-                "bcaaab5e.f760b"\r
+                "58b223b2.226b5c",\r
+                "74cd1f0b.113038",\r
+                "4f39f2a5.5bd5fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9d11d4a.ea432",\r
+        "id": "c6d53bc.53f5bc8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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": 1165.5272216796875,\r
-        "y": 1289.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1168.5272216796875,\r
+        "y": 1280.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "dc15d354.485648",\r
-                "36cada17.d60606"\r
+                "66a971fa.46a568",\r
+                "3bf26416.4deddc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81bac551.cc757",\r
+        "id": "787bd09.8ff59b",\r
         "type": "comment",\r
         "name": "call domain controller to  create underlay OTN tunnel",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1214.5272216796875,\r
-        "y": 1374.49560546875,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1217.5272216796875,\r
+        "y": 1365.49560546875,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9c270fa.7abd5",\r
+        "id": "ee991e0.ab6b36",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-create-otn-tunnel",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1234.5272216796875,\r
-        "y": 1418.49560546875,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1237.5272216796875,\r
+        "y": 1409.49560546875,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de539d0a.26596",\r
+        "id": "8a72c5de.69f39",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 816.5272216796875,\r
-        "y": 1429.0407409667969,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 819.5272216796875,\r
+        "y": 1420.0407409667969,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8c2f104c.2ab35",\r
-                "3b0a5525.2ac102",\r
-                "2c3edd05.477cca",\r
-                "543dd31e.1a6c4c",\r
-                "e9d11d4a.ea432",\r
-                "ab256b41.e2d9b8",\r
-                "f9c270fa.7abd5"\r
+                "124c6957.e07dc7",\r
+                "3ce3b19a.7c10c6",\r
+                "d661efba.3fa238",\r
+                "ee991e0.ab6b36",\r
+                "f7756434.d014e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "641e0b16.a7aa44",\r
+        "id": "ab7e4ea9.e8e178",\r
         "type": "comment",\r
         "name": "Loop through UNIs and configure domain controllers",\r
         "info": "",\r
         "comments": "",\r
-        "x": 751.5003662109375,\r
-        "y": 1237.5003662109375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 754.5003662109375,\r
+        "y": 1228.5003662109375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c3edd05.477cca",\r
+        "id": "124c6957.e07dc7",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<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' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<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
         "comments": "",\r
-        "x": 1080.52734375,\r
-        "y": 1497.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1083.52734375,\r
+        "y": 1488.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "543dd31e.1a6c4c",\r
+        "id": "3ce3b19a.7c10c6",\r
         "type": "set",\r
         "name": "set attachment_param",\r
         "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<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`' />\n<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`' />\n<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`' />\n<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`' />\n\n",\r
         "comments": "",\r
-        "x": 1105.02734375,\r
-        "y": 1537.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1108.02734375,\r
+        "y": 1528.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab256b41.e2d9b8",\r
+        "id": "d661efba.3fa238",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncRestApi.token_id",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1140.52734375,\r
-        "y": 1577.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1143.52734375,\r
+        "y": 1568.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "7aea425d.d2ac8c",\r
-                "c6896fdc.d8f088"\r
+                "f63083b5.0624b",\r
+                "fbf2273e.fbe678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7a0edea.212a28",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1657.52734375,\r
-        "y": 1597.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1660.52734375,\r
+        "y": 1588.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "dc79f422.6ffec8",\r
-                "fce6e76c.ef0f5"\r
+                "72a042fd.6a9e5c",\r
+                "4ae2509c.7d19b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc79f422.6ffec8",\r
+        "id": "72a042fd.6a9e5c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2001.02734375,\r
-        "y": 1597.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2004.02734375,\r
+        "y": 1588.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "e78610af.f485d"\r
+                "743fa383.cc94fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e78610af.f485d",\r
+        "id": "743fa383.cc94fc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2158.52734375,\r
-        "y": 1597.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2161.52734375,\r
+        "y": 1588.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3c748274.94d126",\r
+        "id": "7e01ab8f.069484",\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=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "x": 2155.02734375,\r
-        "y": 1557.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2158.02734375,\r
+        "y": 1548.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fce6e76c.ef0f5",\r
+        "id": "4ae2509c.7d19b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1997.02734375,\r
-        "y": 1557.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 2000.02734375,\r
+        "y": 1548.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "3c748274.94d126"\r
+                "7e01ab8f.069484"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7aea425d.d2ac8c",\r
+        "id": "f63083b5.0624b",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1353.3711738586426,\r
-        "y": 1557.162670135498,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1356.3711738586426,\r
+        "y": 1548.162670135498,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "7a6c581b.b1ed5"\r
+                "42cb8b06.e7daec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6896fdc.d8f088",\r
+        "id": "fbf2273e.fbe678",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1357.02734375,\r
-        "y": 1597.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1360.02734375,\r
+        "y": 1588.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "e7a0edea.212a28"\r
+                "678c3911.078e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a6c581b.b1ed5",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1667.52734375,\r
-        "y": 1557.040771484375,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1670.52734375,\r
+        "y": 1548.040771484375,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "fce6e76c.ef0f5",\r
-                "dc79f422.6ffec8"\r
+                "4ae2509c.7d19b8",\r
+                "72a042fd.6a9e5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25602afb.1d9cfe",\r
+        "id": "28391a2c.3321fe",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 722,\r
-        "y": 672,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 725,\r
+        "y": 663,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "8bfca5dd.ccec38"\r
+                "6a811cc0.b174ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9afb163.16d81",\r
+        "id": "51c3744a.753414",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1992,\r
-        "y": 826,\r
-        "z": "5c3e2071.30fcf",\r
+        "x": 1995,\r
+        "y": 817,\r
+        "z": "9b26c8a0.a64c1",\r
         "wires": [\r
             [\r
-                "6d7469b.d065118"\r
+                "796d1bdc.d65e9c"\r
             ]\r
         ]\r
+    },\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
+        "comments": "",\r
+        "x": 655,\r
+        "y": 1015,\r
+        "z": "9b26c8a0.a64c1",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
index 191456b..0a95efc 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "41bcd68b.3b187",\r
+        "id": "bdabd9df.2798c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 117,\r
-        "y": 66,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 134,\r
+        "y": 76,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "68ff8d75.08d6bc"\r
+                "37325ab3.a584e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68ff8d75.08d6bc",\r
+        "id": "37325ab3.a584e6",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,600 +22,608 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 248.2856903076172,\r
-        "y": 115.23810863494873,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 265.2856903076172,\r
+        "y": 125.23810863494873,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "e9c8e7da.08db58"\r
+                "89aa288e.14e82"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9c8e7da.08db58",\r
+        "id": "89aa288e.14e82",\r
         "type": "method",\r
         "name": "method sotn-vf-operation-uni-create",\r
         "xml": "<method rpc='sotn-vf-operation-uni-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 251.42861938476562,\r
-        "y": 200.00003242492676,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 268.4286193847656,\r
+        "y": 210.00003242492676,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "9b876278.69aec"\r
+                "6a0993ac.72dd54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6719136.d1d408",\r
+        "id": "a9a04009.84cea",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 625.5273399353027,\r
-        "y": 85,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 642.5273399353027,\r
+        "y": 95,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "de455676.bfc4b8"\r
+                "61b0d7e5.2d7618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de455676.bfc4b8",\r
+        "id": "61b0d7e5.2d7618",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 812.194019317627,\r
-        "y": 84.33329772949219,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 829.194019317627,\r
+        "y": 94.33329772949219,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "caff06c1.7f0ea8"\r
+                "bd3df9dd.cbfcb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caff06c1.7f0ea8",\r
+        "id": "bd3df9dd.cbfcb",\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=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 993.8606452941895,\r
-        "y": 84.33329772949219,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1010.8606452941895,\r
+        "y": 94.33329772949219,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2806a3d2.9200ac",\r
+        "id": "4ccd346e.b2fa8c",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 615.1067600250244,\r
-        "y": 139.50003504753113,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 632.1067600250244,\r
+        "y": 149.50003504753113,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "baaa4638.c65"\r
+                "a043ea5a.d72c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baaa4638.c65",\r
+        "id": "a043ea5a.d72c3",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 866.106855392456,\r
-        "y": 135.1666555404663,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 883.106855392456,\r
+        "y": 145.1666555404663,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "ac6af028.e56f6"\r
+                "1c9dfc9b.785bf3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac6af028.e56f6",\r
+        "id": "1c9dfc9b.785bf3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1084.4401721954346,\r
-        "y": 137.1666374206543,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1101.4401721954346,\r
+        "y": 147.1666374206543,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "8e9b59f5.9fbff8"\r
+                "969f295d.058158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e9b59f5.9fbff8",\r
+        "id": "969f295d.058158",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1237.773344039917,\r
-        "y": 137.16665840148926,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1254.773344039917,\r
+        "y": 147.16665840148926,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e32594d8.14f33",\r
+        "id": "40f51cac.5aaffc",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 629.1067790985107,\r
-        "y": 200.5000331401825,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 646.1067790985107,\r
+        "y": 210.5000331401825,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "5097b64f.8e649"\r
+                "7872a8f4.e17f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5097b64f.8e649",\r
+        "id": "7872a8f4.e17f28",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 791.1068248748779,\r
-        "y": 199.50003218650818,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 808.1068248748779,\r
+        "y": 209.50003218650818,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "f8a1475e.8d7dc8"\r
+                "ecf654ed.ac8c08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8a1475e.8d7dc8",\r
+        "id": "ecf654ed.ac8c08",\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=\"vnf id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 940.3569164276123,\r
-        "y": 197.27790999412537,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 957.3569164276123,\r
+        "y": 207.27790999412537,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c723171.97826",\r
+        "id": "1bbfcdc4.cfc1ea",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 663.777361869812,\r
-        "y": 261.9999940395355,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 680.777361869812,\r
+        "y": 271.9999940395355,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "d3dcde48.41f3",\r
-                "9c9a7796.629b6"\r
+                "76a0bc4c.3ecaac",\r
+                "7c11fc12.2ce60c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3dcde48.41f3",\r
+        "id": "76a0bc4c.3ecaac",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.7773723602295,\r
-        "y": 237.99999117851257,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 911.7773723602295,\r
+        "y": 247.99999117851257,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "eb2b3da4.ac3bf"\r
+                "dcfece83.e40b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c9a7796.629b6",\r
+        "id": "7c11fc12.2ce60c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894.7773723602295,\r
-        "y": 277.9999911785126,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 911.7773723602295,\r
+        "y": 287.9999911785126,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "9e326ce7.36ba2"\r
+                "5a1242b8.d2d7dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb2b3da4.ac3bf",\r
+        "id": "dcfece83.e40b18",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1037.2773723602295,\r
-        "y": 237.99999117851257,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1054.2773723602295,\r
+        "y": 247.99999117851257,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e326ce7.36ba2",\r
+        "id": "5a1242b8.d2d7dc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039.1344165802002,\r
-        "y": 277.9365031719208,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1056.1344165802002,\r
+        "y": 287.9365031719208,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "bb4f26d0.2b52f8",\r
-                "c6144a09.68351"\r
+                "fc192c7c.c666c",\r
+                "3d110b04.3f7cfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6144a09.68351",\r
+        "id": "3d110b04.3f7cfc",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1191.8328914642334,\r
-        "y": 247.55560186458752,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1208.8328914642334,\r
+        "y": 257.5556018645875,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb4f26d0.2b52f8",\r
+        "id": "fc192c7c.c666c",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1248.261396408081,\r
-        "y": 300.7777316570282,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1265.261396408081,\r
+        "y": 310.7777316570282,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "cadc9be5.e759e"\r
+                "88b73d6e.6d468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcf618d7.ce2b98",\r
+        "id": "442e188e.f803c",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1471.9121265411377,\r
-        "y": 259.03178906440735,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1488.9121265411377,\r
+        "y": 269.03178906440735,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cadc9be5.e759e",\r
+        "id": "88b73d6e.6d468",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1523.5471172332764,\r
-        "y": 300.3492343425751,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1540.5471172332764,\r
+        "y": 310.3492343425751,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "c1e99eff.0e5d48"\r
+                "ea98d10d.89934"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1e99eff.0e5d48",\r
+        "id": "ea98d10d.89934",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1424.2773151397705,\r
-        "y": 358.9206655025482,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1441.2773151397705,\r
+        "y": 368.9206655025482,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "840dd033.d02e68"\r
+                "acd8ea2b.eae8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "840dd033.d02e68",\r
+        "id": "acd8ea2b.eae8b8",\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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1572.0274181365967,\r
-        "y": 358.7778575713746,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1589.0274181365967,\r
+        "y": 368.7778575713746,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "425e7a20.0b25dc",\r
+        "id": "59edc1a3.014a68",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 708.3571338653564,\r
-        "y": 334.8294517993927,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 725.3571338653564,\r
+        "y": 344.8294517993927,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26fdcf88.d41188",\r
+        "id": "848c6001.e3ca1",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 670.3569316864014,\r
-        "y": 378.16278433799744,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 687.3569316864014,\r
+        "y": 388.16278433799744,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "d2a88646.f84f6"\r
+                "502abba1.49866c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2a88646.f84f6",\r
+        "id": "502abba1.49866c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 885.135274887085,\r
-        "y": 375.71836829185486,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 902.135274887085,\r
+        "y": 385.71836829185486,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "6ee856f3.a6b1a",\r
-                "7919b72e.9e665"\r
+                "e8577fea.dc9eb",\r
+                "c88b6740.086e48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ee856f3.a6b1a",\r
+        "id": "e8577fea.dc9eb",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1081.3914775848389,\r
-        "y": 353.46650671958923,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1098.3914775848389,\r
+        "y": 363.46650671958923,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7919b72e.9e665",\r
+        "id": "c88b6740.086e48",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1050.8359050750732,\r
-        "y": 390.46662306785583,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1067.8359050750732,\r
+        "y": 400.46662306785583,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b876278.69aec",\r
+        "id": "6a0993ac.72dd54",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 324.1067714691162,\r
-        "y": 395.4961154460907,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 341.1067714691162,\r
+        "y": 405.4961154460907,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "26fdcf88.d41188",\r
-                "b6719136.d1d408",\r
-                "7c723171.97826",\r
-                "6c8900d6.0d8e58",\r
-                "49bfdced.7c2bbc",\r
-                "bf7bb77.41be8c8",\r
-                "abc1f25f.e43c08",\r
-                "8c309fdb.0398f",\r
-                "91a89d7a.a0f178",\r
-                "2806a3d2.9200ac",\r
-                "e32594d8.14f33",\r
-                "2b448345.aa142c",\r
-                "d1e54672.f82058",\r
-                "abd09dc6.c02b78",\r
-                "4b4cd818.a8df08",\r
-                "a0154eab.2fbc7"\r
+                "848c6001.e3ca1",\r
+                "1bbfcdc4.cfc1ea",\r
+                "53255108.3aa87",\r
+                "eb87c476.701828",\r
+                "60cc5c3c.7af384",\r
+                "6cc42136.9a456",\r
+                "18de011.772867f",\r
+                "56659886.9d87b",\r
+                "46813925.b275b",\r
+                "4dcd3e86.6f4288",\r
+                "1e2320ca.16ae1f",\r
+                "922a3600.fd199",\r
+                "d21f4a10.58364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c309fdb.0398f",\r
+        "id": "18de011.772867f",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 611.3292503356934,\r
-        "y": 933.00732421875,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 628.3292503356934,\r
+        "y": 943.00732421875,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abc1f25f.e43c08",\r
+        "id": "6cc42136.9a456",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-to`\" value=\"uni\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-link`\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`\" value=\"id\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`\" value=\"`$prop.vf-id`\" />\n",\r
+        "xml": "<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' -->\n<!--      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-to`\" value=\"uni\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-link`\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`\" value=\"id\" />-->\n<!--<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`\" value=\"`$prop.vf-id`\" />-->\n\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vf-id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666.606746673584,\r
-        "y": 891.83349609375,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 683.606746673584,\r
+        "y": 901.83349609375,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bf7bb77.41be8c8",\r
+        "id": "60cc5c3c.7af384",\r
         "type": "save",\r
         "name": "save uni resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $prop.vf-id' >\n<parameter name=\"id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"tpId\" value='`$prop.uni.tpId`' />\n<parameter name='cVLAN' value='`$prop.uni.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $prop.vf-id' >\n<parameter name=\"id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"tp-id\" value='`$prop.uni.tp-id`' />\n<parameter name='cVLAN' value='`$prop.uni.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 648.6068077087402,\r
-        "y": 787.83349609375,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 665.6068077087402,\r
+        "y": 797.83349609375,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "91a89d7a.a0f178",\r
+        "id": "56659886.9d87b",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
         "comments": "",\r
-        "x": 666.1067790985107,\r
-        "y": 738.5000331401825,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 683.1067790985107,\r
+        "y": 748.5000331401825,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49bfdced.7c2bbc",\r
+        "id": "eb87c476.701828",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
-        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $prop.vf-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n\n\n <!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->\n",\r
         "comments": "",\r
-        "x": 649.6068153381348,\r
-        "y": 696.3335154056549,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 666.6068153381348,\r
+        "y": 706.3335154056549,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c8900d6.0d8e58",\r
+        "id": "53255108.3aa87",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",\r
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 661.4598903656006,\r
-        "y": 644.8296692371368,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 678.4598903656006,\r
+        "y": 654.8296692371368,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abd09dc6.c02b78",\r
+        "id": "1e2320ca.16ae1f",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 641.5273399353027,\r
-        "y": 537,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 658.5273399353027,\r
+        "y": 547,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b448345.aa142c",\r
+        "id": "46813925.b275b",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 648.526927947998,\r
-        "y": 431.9912657737732,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 665.526927947998,\r
+        "y": 441.9912657737732,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1e54672.f82058",\r
+        "id": "4dcd3e86.6f4288",\r
         "type": "call",\r
         "name": "call sotn-get-vf-module-uni-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-vf-module-uni-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 687.3406028747559,\r
-        "y": 484.83709144592285,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 704.3406028747559,\r
+        "y": 494.83709144592285,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b4cd818.a8df08",\r
+        "id": "922a3600.fd199",\r
         "type": "execute",\r
         "name": "execute generate-vf-id",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 640.3406181335449,\r
-        "y": 593.3409690856934,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 657.3406181335449,\r
+        "y": 603.3409690856934,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a0154eab.2fbc7",\r
+        "id": "f8f11492.e98458",\r
         "type": "get-resource",\r
         "name": "get-resource generic-vnf",\r
         "xml": "<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' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 638.5273399353027,\r
-        "y": 843,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 655.5273399353027,\r
+        "y": 853,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "288ce8e3.088cd"\r
+                "3535eafb.6a02f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42b83e22.53c9",\r
+        "id": "670e04c7.7b4c04",\r
         "type": "set",\r
         "name": "set tmp.relationship_length",\r
         "xml": "<set>\n<parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",\r
         "comments": "",\r
-        "x": 1154.52734375,\r
-        "y": 801,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 1171.52734375,\r
+        "y": 811,\r
+        "z": "d9929d00.bfba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "288ce8e3.088cd",\r
+        "id": "3535eafb.6a02f6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868,\r
-        "y": 821,\r
-        "z": "c1f3ee3d.7e867",\r
+        "x": 885,\r
+        "y": 831,\r
+        "z": "d9929d00.bfba4",\r
         "wires": [\r
             [\r
-                "42b83e22.53c9"\r
+                "670e04c7.7b4c04"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "d21f4a10.58364",\r
+        "type": "set",\r
+        "name": "set vnf-index",\r
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n\n\n",\r
+        "comments": "",\r
+        "x": 626,\r
+        "y": 33,\r
+        "z": "d9929d00.bfba4",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
index 9730d51..ce7f41a 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "f8944be3.096ab8",\r
+        "id": "e012ce90.0e58e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 111,\r
-        "y": 56,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 154,\r
+        "y": 93,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "68420034.5c6d98"\r
+                "971026a6.52ce9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68420034.5c6d98",\r
+        "id": "971026a6.52ce9",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,350 +22,350 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 242.2856903076172,\r
-        "y": 105.23810863494873,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 285.2856903076172,\r
+        "y": 142.23810863494873,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "9e33642a.9ab6b8"\r
+                "424280.3e7be58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e33642a.9ab6b8",\r
+        "id": "424280.3e7be58",\r
         "type": "method",\r
         "name": "method sotn-vnf-topology-operation-underlay-activate",\r
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 245.42861938476562,\r
-        "y": 190.00003242492676,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 288.4286193847656,\r
+        "y": 227.00003242492676,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "f3fc4610.118298"\r
+                "15b1d170.c6c3bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3fc4610.118298",\r
+        "id": "15b1d170.c6c3bf",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 395.238037109375,\r
-        "y": 319.6666564941406,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 438.238037109375,\r
+        "y": 356.6666564941406,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "321f78ca.ccdc38",\r
-                "47a0d8c5.66ef38",\r
-                "30a9bb6d.ac3de4",\r
-                "470fa21f.c90dac",\r
-                "a9e79f17.0260f",\r
-                "79db1524.d2b97c",\r
-                "47e6b5ed.41cf1c"\r
+                "d341e8da.386dc8",\r
+                "7757d326.0ab11c",\r
+                "28b09a42.4448ee",\r
+                "3ec3b54e.f18002",\r
+                "363c01cb.431f2e",\r
+                "b58db0f2.2bd788",\r
+                "78a6cae.62d4c34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "321f78ca.ccdc38",\r
+        "id": "d341e8da.386dc8",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Active",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",\r
         "comments": "",\r
-        "x": 738.3849563598633,\r
-        "y": 556.6705458434299,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 781.3849563598633,\r
+        "y": 593.6705458434299,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47a0d8c5.66ef38",\r
+        "id": "7757d326.0ab11c",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 658.571647644043,\r
-        "y": 682.5970833571628,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 701.571647644043,\r
+        "y": 719.5970833571628,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30a9bb6d.ac3de4",\r
+        "id": "28b09a42.4448ee",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 744.5716018676758,\r
-        "y": 504.5968001158908,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 787.5716018676758,\r
+        "y": 541.5968001158908,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "470fa21f.c90dac",\r
+        "id": "3ec3b54e.f18002",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 753,\r
-        "y": 259,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 796,\r
+        "y": 296,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "bde1ee44.7683d",\r
-                "2e788e91.c6a1c2",\r
-                "946699e9.3b5b1"\r
+                "2a1b5222.0a12ce",\r
+                "7071c692.fef0f",\r
+                "f5af0773.6ebfd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "946699e9.3b5b1",\r
+        "id": "f5af0773.6ebfd8",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1145.968994140625,\r
-        "y": 224.96875,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1188.968994140625,\r
+        "y": 261.96875,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "5b4e6761.75d918"\r
+                "deb6d8c5.8a0d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b4e6761.75d918",\r
+        "id": "deb6d8c5.8a0d18",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1300.7778816223145,\r
-        "y": 243.889018535614,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1343.7778816223145,\r
+        "y": 280.889018535614,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bde1ee44.7683d",\r
+        "id": "2a1b5222.0a12ce",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1139.0001335144043,\r
-        "y": 264.00007152557373,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1182.0001335144043,\r
+        "y": 301.00007152557373,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "5b4e6761.75d918"\r
+                "deb6d8c5.8a0d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e788e91.c6a1c2",\r
+        "id": "7071c692.fef0f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1132.0005416870117,\r
-        "y": 297.000075340271,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1175.0005416870117,\r
+        "y": 334.000075340271,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "ebf17a44.2210a8"\r
+                "16d2cb29.ef702d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf17a44.2210a8",\r
+        "id": "16d2cb29.ef702d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1279.2700843811035,\r
-        "y": 297.5547204017639,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1322.2700843811035,\r
+        "y": 334.5547204017639,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "e3ab2fd7.ebbf08"\r
+                "ed1ae4ee.47337"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3ab2fd7.ebbf08",\r
+        "id": "ed1ae4ee.47337",\r
         "type": "for",\r
         "name": "for vidx..service-data.vnfs.vnf_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1525.2862014770508,\r
-        "y": 304.42864084243774,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1568.2862014770508,\r
+        "y": 341.42864084243774,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "18572251.98d83e"\r
+                "3d63efba.81c87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18572251.98d83e",\r
+        "id": "3d63efba.81c87",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1744.6358337402344,\r
-        "y": 303.96872091293335,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1787.6358337402344,\r
+        "y": 340.96872091293335,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "4a39ea58.7fb184"\r
+                "db2db94d.9596f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a39ea58.7fb184",\r
+        "id": "db2db94d.9596f8",\r
         "type": "switchNode",\r
         "name": "switch vnfid found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1898.715431213379,\r
-        "y": 303.67880296707153,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1941.715431213379,\r
+        "y": 340.67880296707153,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "669b0d11.8a0824"\r
+                "b38b8c2b.ab959"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "669b0d11.8a0824",\r
+        "id": "b38b8c2b.ab959",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2109.6675758361816,\r
-        "y": 306.571494102478,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 2152.6675758361816,\r
+        "y": 343.571494102478,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "e89a8750.1f8e18"\r
+                "f56ad8f6.f25e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e89a8750.1f8e18",\r
+        "id": "f56ad8f6.f25e88",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
         "comments": "",\r
-        "x": 2319.199951171875,\r
-        "y": 308.32159423828125,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 2362.199951171875,\r
+        "y": 345.32159423828125,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9e79f17.0260f",\r
+        "id": "363c01cb.431f2e",\r
         "type": "save",\r
         "name": "update AnAI - vnf-instance.orchestration-status",\r
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 763.9999618530273,\r
-        "y": 623.0103714736179,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 806.9999618530273,\r
+        "y": 660.0103714736179,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "79db1524.d2b97c",\r
+        "id": "b58db0f2.2bd788",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
         "comments": "",\r
-        "x": 743.0000762939453,\r
-        "y": 454.01033284980804,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 786.0000762939453,\r
+        "y": 491.01033284980804,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47e6b5ed.41cf1c",\r
+        "id": "78a6cae.62d4c34",\r
         "type": "switchNode",\r
         "name": "switch vnf-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 729.7499389648438,\r
-        "y": 359.00390270072967,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 772.7499389648438,\r
+        "y": 396.00390270072967,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "3e2d00ea.214d9",\r
-                "ed7ee56e.298fc8"\r
+                "d6917198.13129",\r
+                "178db909.328e8f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e2d00ea.214d9",\r
+        "id": "d6917198.13129",\r
         "type": "outcome",\r
         "name": "outcome Created",\r
         "xml": "<outcome value='Created'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1109.5833320617676,\r
-        "y": 364.1149909766391,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1152.5833320617676,\r
+        "y": 401.1149909766391,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "34b25335.603514"\r
+                "6cd721df.116148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed7ee56e.298fc8",\r
+        "id": "178db909.328e8f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1087.583351135254,\r
-        "y": 414.1150024207309,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1130.583351135254,\r
+        "y": 451.1150024207309,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             [\r
-                "4a64950b.2e4a84"\r
+                "ff0fdf62.38c4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a64950b.2e4a84",\r
+        "id": "ff0fdf62.38c4c",\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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
         "comments": "",\r
-        "x": 1247.0831184387207,\r
-        "y": 417.1150014670566,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1290.0831184387207,\r
+        "y": 454.1150014670566,\r
+        "z": "770d39a2.206bf8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34b25335.603514",\r
+        "id": "6cd721df.116148",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1319.889705657959,\r
-        "y": 375.44016626197845,\r
-        "z": "9dcfec88.5f292",\r
+        "x": 1362.889705657959,\r
+        "y": 412.44016626197845,\r
+        "z": "770d39a2.206bf8",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
index fe1d70f..f834495 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "630403de.7c4dfc",\r
+        "id": "c51171cf.967f48",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 130,\r
-        "y": 71,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 215,\r
+        "y": 61,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "80c50a18.8d75c"\r
+                "dc4fe414.ffc068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80c50a18.8d75c",\r
+        "id": "dc4fe414.ffc068",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,481 +22,481 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 414.2856903076172,\r
-        "y": 132.23810863494873,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 499.2856903076172,\r
+        "y": 122.23810863494873,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "2da8c00e.5874f"\r
+                "7bc6b10b.958808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2da8c00e.5874f",\r
+        "id": "7bc6b10b.958808",\r
         "type": "method",\r
         "name": "method sotn-vnf-topology-operation-underlay-create",\r
         "xml": "<method rpc='sotn-vnf-topology-operation-underlay-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 420.42860412597656,\r
-        "y": 217.00003051757812,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 505.42860412597656,\r
+        "y": 207.00003051757812,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "c4830870.f71be"\r
+                "abdb94c8.92ca2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4830870.f71be",\r
+        "id": "abdb94c8.92ca2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 790.238037109375,\r
-        "y": 241.66668701171875,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 875.238037109375,\r
+        "y": 231.66668701171875,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "d09b0487.d267f8",\r
-                "4e465113.c34b3",\r
-                "6d4651f1.9a44a",\r
-                "b93f8dee.f542a",\r
-                "18feff02.43bff9",\r
-                "e9275990.6ea4e",\r
-                "273e48bf.25ca5",\r
-                "4b57404f.d373b8",\r
-                "4822a493.73c54c",\r
-                "567e338.a899b4c",\r
-                "616296b0.6f36",\r
-                "cdecd2ad.ea2458",\r
-                "9b5e953e.0822e8"\r
+                "ebb673b7.95bb08",\r
+                "b3e2958c.9ee52",\r
+                "e1a71481.b347c",\r
+                "824a2826.fb7a5",\r
+                "23822c5.535c954",\r
+                "db0823f0.79d838",\r
+                "9d444bb6.e5cc7",\r
+                "d8fc2b2b.da9d38",\r
+                "7de6e31b.ca690c",\r
+                "37ce30ff.3ae068",\r
+                "a026f709.be666",\r
+                "d3e90ee2.8cdb8",\r
+                "4530b43d.793bcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e465113.c34b3",\r
+        "id": "b3e2958c.9ee52",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to Created",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
         "comments": "",\r
-        "x": 1212.3848495483398,\r
-        "y": 605.6706197531894,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1297.3848495483398,\r
+        "y": 595.6706197531894,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d09b0487.d267f8",\r
+        "id": "ebb673b7.95bb08",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
         "comments": "",\r
-        "x": 1204.238037109375,\r
-        "y": 500.6668718131259,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1289.238037109375,\r
+        "y": 490.6668718131259,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18feff02.43bff9",\r
+        "id": "23822c5.535c954",\r
         "type": "execute",\r
         "name": "execute generate-vnf-index",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1192.5715408325195,\r
-        "y": 450.3334558280185,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1277.5715408325195,\r
+        "y": 440.3334558280185,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "567e338.a899b4c",\r
+        "id": "37ce30ff.3ae068",\r
         "type": "set",\r
         "name": "set vnf-index to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 1203.5716171264648,\r
-        "y": 557.3334596427158,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1288.5716171264648,\r
+        "y": 547.3334596427158,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d4651f1.9a44a",\r
+        "id": "e1a71481.b347c",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1219.5713577270508,\r
-        "y": 120.33337858039886,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1304.5713577270508,\r
+        "y": 110.33337858039886,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "c4be7092.54bab",\r
-                "bebf6c90.f10358"\r
+                "2aa8bb99.a4b4cc",\r
+                "2ff8b11d.a3a30e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4be7092.54bab",\r
+        "id": "2aa8bb99.a4b4cc",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.285743713379,\r
-        "y": 115.47619893867522,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1539.285743713379,\r
+        "y": 105.47619893867522,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "55302818.0621f"\r
+                "9f14dc9.0335b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55302818.0621f",\r
+        "id": "9f14dc9.0335b2",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1614.5714492797852,\r
-        "y": 115.4762904914096,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1699.5714492797852,\r
+        "y": 105.4762904914096,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bebf6c90.f10358",\r
+        "id": "2ff8b11d.a3a30e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1450.714282989502,\r
-        "y": 148.76203039009124,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1535.714282989502,\r
+        "y": 138.76203039009124,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "d6fccb24.04a71"\r
+                "c07d0fb1.6b3d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "543cefe7.718a7",\r
+        "id": "1270cfd.bc37b3",\r
         "type": "set",\r
         "name": "set vnf-index = vnf_length",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
         "comments": "",\r
-        "x": 1843.5715255737305,\r
-        "y": 127.04775598365813,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1928.5715255737305,\r
+        "y": 117.04775598365813,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d18757b.848c24",\r
+        "id": "41d9a632.4f7ff",\r
         "type": "for",\r
         "name": "for each existing VNF",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1832.000144958496,\r
-        "y": 162.0477278502658,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1917.000144958496,\r
+        "y": 152.0477278502658,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "8ce4ca7d.ffb71"\r
+                "648fa43a.d20ca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6fccb24.04a71",\r
+        "id": "c07d0fb1.6b3d1",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1585.428565979004,\r
-        "y": 150.76199987251312,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1670.428565979004,\r
+        "y": 140.76199987251312,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "543cefe7.718a7",\r
-                "5d18757b.848c24"\r
+                "1270cfd.bc37b3",\r
+                "41d9a632.4f7ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ce4ca7d.ffb71",\r
+        "id": "648fa43a.d20ca4",\r
         "type": "switchNode",\r
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2225.2858810424805,\r
-        "y": 162.6192119391635,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 2310.2858810424805,\r
+        "y": 152.6192119391635,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "46146016.cb5b58"\r
+                "fcc42c1e.bc5548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46146016.cb5b58",\r
+        "id": "fcc42c1e.bc5548",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2506.5715827941895,\r
-        "y": 161.1906173499301,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 2591.5715827941895,\r
+        "y": 151.1906173499301,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "14fd2dd2.04e2ea"\r
+                "51470afc.fd843c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fac5d84d.dacdb8",\r
+        "id": "75fcb25e.311ddc",\r
         "type": "comment",\r
         "name": "make sure this vnf-id doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2194.428497314453,\r
-        "y": 126.19060399848968,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 2279.428497314453,\r
+        "y": 116.19060399848968,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b93f8dee.f542a",\r
+        "id": "824a2826.fb7a5",\r
         "type": "set",\r
         "name": "set new vnf_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 1150.571533203125,\r
-        "y": 398.33343505859375,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1235.571533203125,\r
+        "y": 388.33343505859375,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9275990.6ea4e",\r
+        "id": "db0823f0.79d838",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 1151.5715026855469,\r
-        "y": 868.5969713004306,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1236.5715026855469,\r
+        "y": 858.5969713004306,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4822a493.73c54c",\r
+        "id": "7de6e31b.ca690c",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1184.2382736206055,\r
-        "y": 817.5968644889072,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1269.2382736206055,\r
+        "y": 807.5968644889072,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "273e48bf.25ca5",\r
+        "id": "9d444bb6.e5cc7",\r
         "type": "set",\r
         "name": "set vnf-index and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",\r
         "comments": "",\r
-        "x": 1205.571533203125,\r
-        "y": 646.5968902381137,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1290.571533203125,\r
+        "y": 636.5968902381137,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14fd2dd2.04e2ea",\r
+        "id": "51470afc.fd843c",\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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 2635.142951965332,\r
-        "y": 212.19063165504485,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 2720.142951965332,\r
+        "y": 202.19063165504485,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4b57404f.d373b8",\r
+        "id": "d8fc2b2b.da9d38",\r
         "type": "save",\r
         "name": "save AnAI - vnf-instance.orchestration-status",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey='generic-vnf.vnf-id = $prop.vnf-id' >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\n<parameter name=\"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=\"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=\"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.5458374023438,\r
-        "y": 756.2471072943881,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1345.5458374023438,\r
+        "y": 746.2471072943881,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1ddf67d5.b35a7",\r
+        "id": "766790a.b9c79f",\r
         "type": "comment",\r
         "name": "TODO: change AAI models",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1194.1820983886719,\r
-        "y": 715.9743230612949,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1279.1820983886719,\r
+        "y": 705.9743230612949,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb3e5b54.ee7cc8",\r
+        "id": "a966163d.bdafe8",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1620.7395858764648,\r
-        "y": 209.75002291519195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1705.7395858764648,\r
+        "y": 199.75002291519195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a93d9d55.574d98",\r
+        "id": "1dc30465.a19184",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1424.483383178711,\r
-        "y": 214.00189593154937,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1509.483383178711,\r
+        "y": 204.00189593154937,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "eb3e5b54.ee7cc8",\r
-                "34cb35bb.2ef0aa"\r
+                "a966163d.bdafe8",\r
+                "a75d0084.0dea2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "616296b0.6f36",\r
+        "id": "a026f709.be666",\r
         "type": "for",\r
         "name": "for loop idx - VNF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1209.7050399780273,\r
-        "y": 216.44631197769195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1294.7050399780273,\r
+        "y": 206.44631197769195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "a93d9d55.574d98"\r
+                "1dc30465.a19184"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdecd2ad.ea2458",\r
+        "id": "d3e90ee2.8cdb8",\r
         "type": "set",\r
         "name": "set vnf-request-input.",\r
         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 1166.7046737670898,\r
-        "y": 286.77101900894195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1251.7046737670898,\r
+        "y": 276.77101900894195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34cb35bb.2ef0aa",\r
+        "id": "a75d0084.0dea2",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1597.7395858764648,\r
-        "y": 255.75002291519195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1682.7395858764648,\r
+        "y": 245.75002291519195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b5e953e.0822e8",\r
+        "id": "4530b43d.793bcc",\r
         "type": "for",\r
         "name": "for each sdwan-get-request-input-param",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1222.7395858764648,\r
-        "y": 338.75002291519195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1307.7395858764648,\r
+        "y": 328.75002291519195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "42766226.3db64c"\r
+                "dc4ef169.09fde8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42766226.3db64c",\r
+        "id": "dc4ef169.09fde8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1448.9722518920898,\r
-        "y": 337.09377291519195,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1533.9722518920898,\r
+        "y": 327.09377291519195,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "85dff1eb.0e22b8"\r
+                "b619e27a.688618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85dff1eb.0e22b8",\r
+        "id": "b619e27a.688618",\r
         "type": "switchNode",\r
         "name": "switch vnf name",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1605.4722518920898,\r
-        "y": 335.0938339503482,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1690.4722518920898,\r
+        "y": 325.0938339503482,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "2f903a44.280976"\r
+                "91d21a65.20ca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f903a44.280976",\r
+        "id": "91d21a65.20ca",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1766.4726181030273,\r
-        "y": 335.09389498550445,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 1851.4726181030273,\r
+        "y": 325.09389498550445,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": [\r
             [\r
-                "55b726c2.cd02d"\r
+                "9c25080f.021b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55b726c2.cd02d",\r
+        "id": "9c25080f.021b",\r
         "type": "set",\r
         "name": "set vnf name",\r
         "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1924.4727401733398,\r
-        "y": 333.6939316065982,\r
-        "z": "adc7d7d7.2ba55",\r
+        "x": 2009.4727401733398,\r
+        "y": 323.6939316065982,\r
+        "z": "2acad42e.98ae6c",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
index 4527b78..c6505ad 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
@@ -3,27 +3,34 @@
     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-create-otn-tunnel' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$oof.vpn.access-provider-id`'>\r
-                <outcome value='`$domain-A.provider-id`'>\r
-\ 1\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+                <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+                <parameter name='target' value='`$domain-A.network-id`' />\r
+                <outcome value='true'>\r
                     <block atomic="true">\r
                         <set>\r
-                            <parameter name='tmp.otn-domain.' value='`$domain-A.`' />\r
+                            <parameter name='otn-domain.' value='`$domain-A.`' />\r
                         </set>\r
                     </block>\r
                 </outcome>\r
-                <outcome value='`$domain-B.provider-id`'>\r
-\ 1\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='$tmp.otn-domain.' value='`$domain-B.`' />\r
-                        </set>\r
-                    </block>\r
+                <outcome value='false'>\r
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+                        <parameter name='target' value='`$domain-B.network-id`' />\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\r
+                                <set>\r
+                                    <parameter name='$otn-domain.' value='`$domain-B.`' />\r
+                                </set>\r
+                            </block>\r
+                        </outcome>\r
+                    </execute>\r
                 </outcome>\r
-            </switch>\r
-            <switch test='`$oof.vpn.access-node-id`'>\r
-                <outcome value='`$oof.vpns[0].access-node-id`'>\r
-\ 1\r
+            </execute>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+                <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+                <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />\r
+                <outcome value='true'>\r
                     <block atomic="true">\r
                         <set>\r
                             <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />\r
@@ -44,29 +51,34 @@
                         </set>\r
                     </block>\r
                 </outcome>\r
-                <outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>\r
-\ 1\r
-                    <block atomic="true">\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 value='false'>\r
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+                        <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\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
                 </outcome>\r
-            </switch>\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

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
index 9a86f93..7159b23 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
@@ -27,222 +27,240 @@
                     <block></block>\r
                 </outcome>\r
             </execute>\r
-            <for index='vidx' start='0' end='`$otn-oof.otn-links_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].`' />\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
-               AND depth = '0'"\r
+               key="logical-link.link-name = $otn-oof.link-name"\r
         pfx='tmp.aai.cross-link' local-only='false' >\r
+                        <!--AND depth = '0'"-->\r
                         <outcome value='success'>\r
-                            <switch test='`$tmp.aai.cross-link.link-role`'>\r
-                                <outcome value='cross-domain-link'>\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[0].relationship-value`" />\r
-                                            <parameter name='tmp.cross-link.dst-ltpId' 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
+                            <block>\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="p-interface.interface-name = $tmp.src-ltpId \r
-               AND depth = '0'"\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
-                                            <outcome value='success'>\r
-                                                <set>\r
-                                                    <parameter name='tmp.src-pnf-name' value="`$tmp.aai.src-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`" />\r
-                                                </set>\r
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                                <!--AND depth = '0'"-->\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
-               AND depth = '0'"\r
+               key="pnf.pnf-name = $tmp.src-pnf-name"\r
         pfx='tmp.aai.src-pnf' local-only='false' >\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
-                                                            </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
-                                                                        <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
-                                                                            </set>\r
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                                            <!--AND depth = '0'"-->\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
+                                                                    </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
+                                                                                <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
+                                                                                    </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
+                                                                                        <outcome value='success'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />\r
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </get-resource>\r
+                                                                                </block>\r
+                                                                            </outcome>\r
+                                                                            <outcome value='network-resource'>\r
+                                                                                <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />\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
-                                                                                </outcome>\r
-                                                                            </get-resource>\r
-                                                                        </block>\r
-                                                                    </outcome>\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
-                                                                            </set>\r
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \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
-                                                                                    <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
-                                                                                    </set>\r
-                                                                                </outcome>\r
-                                                                            </get-resource>\r
-                                                                        </block>\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
-                                            </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
+                                                                                        <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
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </get-resource>\r
+                                                                                </block>\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
+                                                    </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="p-interface" \r
-               key="p-interface.interface-name = $tmp.dst-ltpId \r
-               AND depth = '0'"\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
-                                            <outcome value='success'>\r
-                                                <set>\r
-                                                    <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.dst-tp.relationship-list.relationship[0].relationship-data[0].relationship-value`" />\r
-                                                </set>\r
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                                <!--AND depth = '0'"-->\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
-               AND depth = '0'"\r
+               key="pnf.pnf-name = $tmp.dst-pnf-name"\r
         pfx='tmp.aai.dst-pnf' local-only='false' >\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
-                                                            </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
-                                                                        <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
-                                                                            </set>\r
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                                            <!--AND depth = '0'"-->\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
+                                                                    </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
+                                                                                <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
+                                                                                    </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
+                                                                                        <outcome value='success'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />\r
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </get-resource>\r
+                                                                                </block>\r
+                                                                            </outcome>\r
+                                                                            <outcome value='network-resource'>\r
+                                                                                <block atomic="true">\r
                                                                                     <set>\r
-                                                                                        <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />\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
-                                                                                </outcome>\r
-                                                                            </get-resource>\r
-                                                                        </block>\r
-                                                                    </outcome>\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
-                                                                            </set>\r
-                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \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
-                                                                                    <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
-                                                                                    </set>\r
-                                                                                </outcome>\r
-                                                                            </get-resource>\r
-                                                                        </block>\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
-                                            </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
-                                        <break/>\r
-                                    </block>\r
-                                </outcome>\r
-                            </switch>\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
+                                                                                            </set>\r
+                                                                                        </outcome>\r
+                                                                                    </get-resource>\r
+                                                                                </block>\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
+                                                    </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
+                                            <break/>\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
+                                    </outcome>\r
+                                </switch>\r
+                            </block>\r
                         </outcome>\r
                         <outcome value='not-found'>\r
                             <return status='failure'>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
index 8629403..5297297 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml
@@ -12,10 +12,10 @@
                             </set>\r
                         </outcome>\r
                     </switch>\r
-                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tpId'`">\r
+                    <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'tp-id'`">\r
                         <outcome value='true'>\r
                             <set>\r
-                                <parameter name='prop.uni.tpId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\r
+                                <parameter name='prop.uni.tp-id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\r
                             </set>\r
                         </outcome>\r
                     </switch>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
index e2e61c6..1f3e0f7 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
@@ -1,69 +1,17 @@
 <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
+    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-vf-operation-l2vpn-activate' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value='0'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <block atomic="true">\r
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                            <block>\r
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">\r
-                                    <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='tmp.vidx' value='`$vidx`' />\r
-                                            <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\r
-                                        </set>\r
-                                    </outcome>\r
-                                </switch>\r
-                            </block>\r
-                        </for>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\r
-                <outcome value='Created'>\r
-                    <block atomic="true"></block>\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="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
+                <!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->\r
+                <!--<parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />-->\r
+                <parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vf-module-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <set>\r
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
-            </set>\r
-            <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
-            </set>\r
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                    resource="connectivity"\r
-                    key="connectivity.connectivity-id = $vnfId" >\r
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="connectivity"   \r
+               key="connectivity.connectivity-id = $vnfId" >\r
                 <parameter name="operational-status" value="Active" />\r
             </update>\r
             <return status='success'>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
index 94e218b..98ca621 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
@@ -1,27 +1,29 @@
 <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
+    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-vf-operation-l2vpn-create' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
+            <set>\r
+                <parameter name='vnf-index' value='0' />\r
+            </set>\r
+            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
-                        <parameter name='vnf-index' value='0' />\r
+                        <parameter name='vf-index' value='0' />\r
                     </set>\r
                 </outcome>\r
                 <outcome value='Other'>\r
                     <block>\r
                         <set>\r
-                            <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\r
+                            <parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\r
                         </set>\r
-                        <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                            <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\r
+                        <for index='idx' start='0' end='`$vf-index`' >\r
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`">\r
                                 <outcome value='true'>\r
                                     <return status='failure'>\r
                                         <parameter name='ack-final' value='Y'/>\r
                                         <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\r
-      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`" />\r
+                                        <parameter name="error-message" value="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data" />\r
                                     </return>\r
                                 </outcome>\r
                             </switch>\r
@@ -29,62 +31,102 @@
                     </block>\r
                 </outcome>\r
             </switch>\r
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">\r
+            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">\r
                 <block>\r
                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                        <parameter name="original_string" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\r
+                        <parameter name="original_string" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\r
                         <parameter name="regex" value="_"/>\r
                         <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
                     </execute>\r
                     <set>\r
-                        <parameter name="`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>\r
+                        <parameter name="`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`" value='`$param-prefix[$param-prefix_length -1]`'/>\r
                     </set>\r
                 </block>\r
             </for>\r
-            <set>\r
-                <parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\r
-            </set>\r
-            <for index="idx" start="0" end="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`">\r
+            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">\r
                 <block>\r
-                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`">\r
+                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`">\r
+                        <outcome value='true'>\r
+                            <set>\r
+                                <parameter name='prop.name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\r
+                            </set>\r
+                        </outcome>\r
+                    </switch>\r
+                    <switch test="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`">\r
                         <outcome value='true'>\r
                             <set>\r
-                                <parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\r
+                                <parameter name='prop.topology' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\r
                             </set>\r
                         </outcome>\r
                     </switch>\r
                 </block>\r
             </for>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\r
+                <parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
             </set>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                <parameter name="ctx-destination" value="prop.connectivity-id"/>\r
-            </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />\r
             </set>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                <parameter name="ctx-destination" value="prop.vpn-vf-index"/>\r
+            </execute>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vpn-vf-index`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
+                <!--<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />-->\r
             </set>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
+                <parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />\r
+                <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ + $vf-module-topology-operation-input.service-information.service-instance-id\r
+ + '/service-data/vnfs/vnf/'\r
+ + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
+ + '/vnf-data/vf-modules/vf-module/'\r
+ + $prop.vpn-vf-index\r
+ + '/vf-module-data/vf-module-topology/'`"/>\r
+                <parameter name='vnf-object-path'\r
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ + $vf-module-topology-operation-input.service-information.service-instance-id\r
+ + '/service-data/vnfs/vnf/'\r
+ + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
+ + '/vnf-data/vnf-topology/'`"/>\r
+                <parameter name='service-object-path'\r
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ + $vf-module-topology-operation-input.service-information.service-instance-id\r
+ + '/service-data/service-topology/'`"/>\r
             </set>\r
             <set>\r
-                <parameter name='vnfId' value='`$prop.vnf-id`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                  resource="connectivity"\r
-                  key='connectivity.connectivity-id = $prop.connectivity-id' >\r
-                <parameter name="operational-status" value="Created" />\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \r
+      key='connectivity.connectivity-id = $prop.vpn-vf-index'>\r
+                <parameter name='connectivity-id' value='`$prop.vpn-vf-index`' />\r
+                <parameter name='operational-status' value='Created' />\r
+                <!--<parameter name='sdwan-vpn-id' value='`$prop.vpn-vf-index`' />-->\r
+                <!--<parameter name='sdwan-vpn-name' value='`$prop.name`' />-->\r
+                <!--<parameter name='topology' value='`$prop.topology`' />-->\r
+                <!--<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />-->\r
+                <!--<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />-->\r
+                <!--<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />-->\r
+                <!--<parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />-->\r
+            </save>\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
+      key='generic-vnf.vnf-id = $vf-module-topology-operation-input.vnf-information.vnf-id' \r
+      force="true" pfx="tmp.AnAI-data">\r
+                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.vpn-vf-index`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vpn-vf-index`" />\r
+                <!--key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index ec76dae..406f52c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -61,7 +61,6 @@
                                         <set>\r
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
                                         </set>\r
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
@@ -71,17 +70,18 @@
             </switch>\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
+               key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"\r
         pfx='tmp.aai.generic-vnf' local-only='false' >\r
+                <!--AND depth = '0'"-->\r
                 <outcome value='success'>\r
                     <block>\r
                         <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
-                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                            <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.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
@@ -168,61 +168,30 @@
                 </outcome>\r
             </get-resource>\r
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
+            <set>\r
+                <parameter name='tmp.unis.uni[0].id' value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />\r
+                <parameter name='tmp.unis.uni[0].tp-id' value="networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1" />\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[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_length' value="2" />\r
+            </set>\r
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r
                 <block atomic="true">\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="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-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
-                            </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
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />\r
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />\r
-                        <parameter name="format" value="json"/>\r
-                        <parameter name="httpMethod" value="post"/>\r
-                        <parameter name="responsePrefix" value="token-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='success'>\r
-                            <set>\r
-                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\r
-                            </set>\r
-                        </outcome>\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 get token rest api" />\r
-                            </return>\r
-                        </outcome>\r
-                    </execute>\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

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
index e582fb7..9648bb6 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
@@ -3,33 +3,9 @@
     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-vf-operation-uni-create' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="404" />\r
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">\r
-                    <outcome value='true'>\r
-                        <set>\r
-                            <parameter name='vnf-index' value='`$idx`' />\r
-                        </set>\r
-                    </outcome>\r
-                </switch>\r
-            </for>\r
-            <switch test='`$vnf-index`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
+            <set>\r
+                <parameter name='vnf-index' value='0' />\r
+            </set>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
@@ -87,6 +63,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\r
             </set>\r
             <set>\r
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
@@ -95,7 +72,7 @@
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vf-modules/vf-module/'\r
- + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
+ + $prop.vf-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
@@ -107,6 +84,7 @@
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
+                <!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\r
@@ -116,32 +94,28 @@
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \r
       key='uni.id = $prop.vf-id' >\r
                 <parameter name="id" value="`$prop.vf-id`" />\r
-                <parameter name="tpId" value='`$prop.uni.tpId`' />\r
-                <parameter name='cVLAN' value='`$prop.uni.vlanId`' />\r
+                <parameter name="tp-id" value='`$prop.uni.tp-id`' />\r
+                <parameter name='cVLAN' value='`$prop.uni.cVLAN`' />\r
                 <parameter name='operational-status' value='Created' />\r
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\r
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />\r
             </save>\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
-                    <set>\r
-                        <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\r
-                    </set>\r
-                </outcome>\r
-            </get-resource>\r
+            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' -->\r
+            <!--      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
+            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />-->\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
       force="true" pfx="tmp.AnAI-data">\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />\r
+                <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $prop.vf-id`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
index 69344e8..3210405 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
@@ -1,6 +1,6 @@
 <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
+    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-vnf-topology-operation-underlay-activate' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -61,9 +61,9 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
             </set>\r
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                    resource="generic-vnf"\r
-                    key="generic-vnf.vnf-id = $vnfId" >\r
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="generic-vnf"   \r
+               key="generic-vnf.vnf-id = $vnfId" >\r
                 <parameter name="orchestration-status" value="Active" />\r
                 <parameter name="vnf-type" value="some vnf-type" />\r
             </update>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
index ba1c3cd..07ba202 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
@@ -1,7 +1,7 @@
 <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='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\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-vnf-topology-operation-underlay-create' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
                 <outcome value=''>\r
@@ -81,9 +81,9 @@
                 <parameter name='vnfId' value='`$prop.vnf-id`' />\r
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                  resource="generic-vnf"\r
-                  key='generic-vnf.vnf-id = $prop.vnf-id' >\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="generic-vnf"   \r
+               key='generic-vnf.vnf-id = $prop.vnf-id' >\r
                 <parameter name="orchestration-status" value="Created" />\r
                 <parameter name="in-maint" value = "true" />\r
                 <parameter name="vnf-type" value='`$prop.vnfName`' />\r
@@ -92,11 +92,11 @@
                 <parameter name="model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>\r
                 <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>\r
             </save>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
-                  key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id\r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\r
-                  force="true" pfx="tmp.AnAI-data">\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \r
+      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
+         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
+         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \r
+      force="true" pfx="tmp.AnAI-data">\r
                 <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r