From c5ddeebff270e2af4c3fdaac3d3223057e2f642b Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 6 Mar 2020 23:15:20 +0000
Subject: [PATCH] Small bug fixes mostly syntax errors in some DGs.

Issue-ID: SDNC-900
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I9952824cfdaab6d9b43cf2e5936f70e74b3ce116
---
 ...ESOURCE-API_sotn-vf-operation-uni-activate.json | 956 +++++++++++----------
 ...-RESOURCE-API_sotn-vf-operation-uni-create.json | 445 +++++-----
 ...RESOURCE-API_sotn-vf-operation-uni-activate.xml | 161 ++--
 ...C-RESOURCE-API_sotn-vf-operation-uni-create.xml |   6 +-
 4 files changed, 797 insertions(+), 771 deletions(-)

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 81ac6874..b8646972 100644
--- 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 @@
 [
     {
-        "id": "fb32b655.b185b8",
+        "id": "ea193d8f.e165e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 97,
-        "y": 26,
-        "z": "84e7e3f2.6b184",
+        "x": 112,
+        "y": 70,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "84e0c1e1.45193"
+                "45143e5e.12cef"
             ]
         ]
     },
     {
-        "id": "84e0c1e1.45193",
+        "id": "45143e5e.12cef",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1316 +22,1332 @@
         "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": 228.2856903076172,
-        "y": 75.23810863494873,
-        "z": "84e7e3f2.6b184",
+        "x": 243.2856903076172,
+        "y": 119.23810863494873,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "45da7482.2ad22c"
+                "22fb039d.719e1c"
             ]
         ]
     },
     {
-        "id": "45da7482.2ad22c",
+        "id": "22fb039d.719e1c",
         "type": "method",
         "name": "method sotn-vf-operation-uni-activate",
         "xml": "<method rpc='sotn-vf-operation-uni-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 231.42861938476562,
-        "y": 160.00003242492676,
-        "z": "84e7e3f2.6b184",
+        "x": 246.42861938476562,
+        "y": 204.00003242492676,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "edcc85d8.9d3d28"
+                "bbe79441.cda0b"
             ]
         ]
     },
     {
-        "id": "2c9ee1fb.c2a40e",
+        "id": "8dca40ca.b6cbc8",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.9959564208984,
-        "y": 340.99998915195465,
-        "z": "84e7e3f2.6b184",
+        "x": 718.9959564208984,
+        "y": 384.99998915195465,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "a85389a5.eba5b8",
-                "b56c9993.d26ec8",
-                "d2286cfd.202a6"
+                "66f88853.0801a8",
+                "5f34a2a5.ce0fbc",
+                "37779f9b.3e84f8"
             ]
         ]
     },
     {
-        "id": "edcc85d8.9d3d28",
+        "id": "bbe79441.cda0b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 322.6626205444336,
-        "y": 445.66670763492584,
-        "z": "84e7e3f2.6b184",
+        "x": 337.6626205444336,
+        "y": 489.66670763492584,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "2c9ee1fb.c2a40e",
-                "fa8ab78.8a0bc48",
-                "83723db3.8501b",
-                "943ab36c.4be4",
-                "56a2543.f406bac",
-                "7638ccf.06d4134",
-                "a53f3f0c.46a7a",
-                "c42e922f.1abaa"
+                "8dca40ca.b6cbc8",
+                "b28368bd.88b17",
+                "91b62864.f184c8",
+                "b0f3fc53.5db61",
+                "b5422f78.9d3e4",
+                "f2975c47.fb694",
+                "aeddedc2.f06158",
+                "5950f717.b81e28"
             ]
         ]
     },
     {
-        "id": "83723db3.8501b",
+        "id": "91b62864.f184c8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 669.0273170471191,
-        "y": 211.269144654274,
-        "z": "84e7e3f2.6b184",
+        "x": 684.0273170471191,
+        "y": 255.269144654274,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "b6860278.b7c3a"
+                "3d5e06d8.9791c2"
             ]
         ]
     },
     {
-        "id": "fa8ab78.8a0bc48",
+        "id": "b28368bd.88b17",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.9959716796875,
-        "y": 150.00001394748688,
-        "z": "84e7e3f2.6b184",
+        "x": 688.9959716796875,
+        "y": 194.00001394748688,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "4d78f4ba.adcf7c"
+                "746b74df.fbc48c"
             ]
         ]
     },
     {
-        "id": "4d78f4ba.adcf7c",
+        "id": "746b74df.fbc48c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 853.9959526062012,
-        "y": 149.0000034570694,
-        "z": "84e7e3f2.6b184",
+        "x": 868.9959526062012,
+        "y": 193.0000034570694,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "83071b4.81cf8e8"
+                "62ebea71.fce5b4"
             ]
         ]
     },
     {
-        "id": "83071b4.81cf8e8",
+        "id": "62ebea71.fce5b4",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1003.4246788024902,
-        "y": 150.14292109012604,
-        "z": "84e7e3f2.6b184",
+        "x": 1018.4246788024902,
+        "y": 194.14292109012604,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "b6860278.b7c3a",
+        "id": "3d5e06d8.9791c2",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 891.9959678649902,
-        "y": 212.00000965595245,
-        "z": "84e7e3f2.6b184",
+        "x": 906.9959678649902,
+        "y": 256.00000965595245,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "a420300f.fcc77"
+                "fccff52.827ec08"
             ]
         ]
     },
     {
-        "id": "a420300f.fcc77",
+        "id": "fccff52.827ec08",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106.9959526062012,
-        "y": 210.0000034570694,
-        "z": "84e7e3f2.6b184",
+        "x": 1121.9959526062012,
+        "y": 254.0000034570694,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "61f2940f.e1eccc"
+                "fc0c6263.7f4b58"
             ]
         ]
     },
     {
-        "id": "5ebe199d.38e1f8",
+        "id": "46df70e6.cbb32",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1447.9959716796875,
-        "y": 178,
-        "z": "84e7e3f2.6b184",
+        "x": 1462.9959716796875,
+        "y": 222,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "b56c9993.d26ec8",
+        "id": "5f34a2a5.ce0fbc",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 963.9959716796875,
-        "y": 365,
-        "z": "84e7e3f2.6b184",
+        "x": 978.9959716796875,
+        "y": 409,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "f74bba14.018558"
+                "b65ac05a.92d3b8"
             ]
         ]
     },
     {
-        "id": "a85389a5.eba5b8",
+        "id": "66f88853.0801a8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 960.9959716796875,
-        "y": 293,
-        "z": "84e7e3f2.6b184",
+        "x": 975.9959716796875,
+        "y": 337,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "f74bba14.018558"
+                "b65ac05a.92d3b8"
             ]
         ]
     },
     {
-        "id": "f74bba14.018558",
+        "id": "b65ac05a.92d3b8",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1132.9959716796875,
-        "y": 327,
-        "z": "84e7e3f2.6b184",
+        "x": 1147.9959716796875,
+        "y": 371,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "d2286cfd.202a6",
+        "id": "37779f9b.3e84f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 925.9959487915039,
-        "y": 435.9999986886978,
-        "z": "84e7e3f2.6b184",
+        "x": 940.9959487915039,
+        "y": 479.9999986886978,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "1141c0c2.8446df"
+                "8619e619.b5b6f"
             ]
         ]
     },
     {
-        "id": "bd0fe0b8.95c3d",
+        "id": "b4807db5.ce3f18",
         "type": "set",
         "name": "set vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",
         "comments": "",
-        "x": 1279.995964050293,
-        "y": 434.0000126361847,
-        "z": "84e7e3f2.6b184",
+        "x": 1294.995964050293,
+        "y": 478.0000126361847,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "1141c0c2.8446df",
+        "id": "8619e619.b5b6f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1086.995994567871,
-        "y": 432.99999010562897,
-        "z": "84e7e3f2.6b184",
+        "x": 1101.995994567871,
+        "y": 476.99999010562897,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "bd0fe0b8.95c3d",
-                "7d4d8763.0f4718"
+                "b4807db5.ce3f18",
+                "b7112b63.fa666"
             ]
         ]
     },
     {
-        "id": "7d4d8763.0f4718",
+        "id": "b7112b63.fa666",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1298.9959335327148,
-        "y": 486.99998915195465,
-        "z": "84e7e3f2.6b184",
+        "x": 1313.9959335327148,
+        "y": 530.9999891519547,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "39d7ac61.94fef4"
+                "207d79b0.f0396e"
             ]
         ]
     },
     {
-        "id": "39d7ac61.94fef4",
+        "id": "207d79b0.f0396e",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1541.995948791504,
-        "y": 481.9999986886978,
-        "z": "84e7e3f2.6b184",
+        "x": 1556.995948791504,
+        "y": 525.9999986886978,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "1b63e74a.2edd39"
+                "f2b976ec.55b34"
             ]
         ]
     },
     {
-        "id": "1b63e74a.2edd39",
+        "id": "f2b976ec.55b34",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1739.9959774017334,
-        "y": 469.00000536441803,
-        "z": "84e7e3f2.6b184",
+        "x": 1754.9959774017334,
+        "y": 513.000005364418,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "21b15a7e.281f96"
+                "eab205c1.ee7e8"
             ]
         ]
     },
     {
-        "id": "21b15a7e.281f96",
+        "id": "eab205c1.ee7e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1891.995948791504,
-        "y": 470.9999986886978,
-        "z": "84e7e3f2.6b184",
+        "x": 1906.995948791504,
+        "y": 514.9999986886978,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "bfa5b77e.850078",
-                "9791123.9d23ff",
-                "5999c8a4.0563c8"
+                "7cce5705.9b51",
+                "b161a727.31db88",
+                "8cc64f67.5de4c"
             ]
         ]
     },
     {
-        "id": "bfa5b77e.850078",
+        "id": "7cce5705.9b51",
         "type": "set",
         "name": "set tmp.vidx and ctx.vnf-data",
         "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",
         "comments": "",
-        "x": 2119.996063232422,
-        "y": 413.0000025033951,
-        "z": "84e7e3f2.6b184",
+        "x": 2134.996063232422,
+        "y": 457.0000025033951,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "9791123.9d23ff",
+        "id": "b161a727.31db88",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 2123.996063232422,
-        "y": 467.0000025033951,
-        "z": "84e7e3f2.6b184",
+        "x": 2138.996063232422,
+        "y": 511.0000025033951,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "943ab36c.4be4",
+        "id": "b0f3fc53.5db61",
         "type": "returnSuccess",
         "name": "return success",
         "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",
         "comments": "",
-        "x": 597.9961547851562,
-        "y": 1640.501220703125,
-        "z": "84e7e3f2.6b184",
+        "x": 612.9961547851562,
+        "y": 1684.501220703125,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "5999c8a4.0563c8",
+        "id": "8cc64f67.5de4c",
         "type": "call",
         "name": "call sotn-get-vf-module-uni-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2154.45108795166,
-        "y": 518.0104948282242,
-        "z": "84e7e3f2.6b184",
+        "x": 2169.45108795166,
+        "y": 562.0104948282242,
+        "z": "5c3e2071.30fcf",
         "wires": [
             []
         ]
     },
     {
-        "id": "56a2543.f406bac",
+        "id": "b5422f78.9d3e4",
         "type": "execute",
         "name": "execute Properties",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 683.9959564208984,
-        "y": 280.5039049386978,
-        "z": "84e7e3f2.6b184",
+        "x": 698.9959564208984,
+        "y": 324.5039049386978,
+        "z": "5c3e2071.30fcf",
         "wires": [
             []
         ]
     },
     {
-        "id": "61f2940f.e1eccc",
+        "id": "fc0c6263.7f4b58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1270,
-        "y": 220,
-        "z": "84e7e3f2.6b184",
+        "x": 1285,
+        "y": 264,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "5ebe199d.38e1f8",
-                "97c5cadc.46fd38"
+                "46df70e6.cbb32",
+                "868e2384.9bd088"
             ]
         ]
     },
     {
-        "id": "97c5cadc.46fd38",
+        "id": "868e2384.9bd088",
         "type": "set",
         "name": "set tmp.vnf-id",
         "xml": "<set>\n<parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",
         "comments": "",
-        "x": 1455,
-        "y": 235,
-        "z": "84e7e3f2.6b184",
+        "x": 1470,
+        "y": 279,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "7638ccf.06d4134",
+        "id": "5950f717.b81e28",
         "type": "get-resource",
         "name": "get-resource generic-vnf",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 603,
-        "y": 552,
-        "z": "84e7e3f2.6b184",
+        "x": 591,
+        "y": 543,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "6951bd2b.63d4e4"
+                "25602afb.1d9cfe"
             ]
         ]
     },
     {
-        "id": "6951bd2b.63d4e4",
+        "id": "8bfca5dd.ccec38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 806,
-        "y": 547,
-        "z": "84e7e3f2.6b184",
+        "x": 821,
+        "y": 591,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "c98c270d.88dcd8",
-                "b05ba34b.acc5f"
+                "3fb86113.9bfd2e",
+                "cea6f99d.9fa3f8"
             ]
         ]
     },
     {
-        "id": "c98c270d.88dcd8",
+        "id": "cea6f99d.9fa3f8",
         "type": "for",
         "name": "for each relationship in gen-vnf",
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1018,
-        "y": 550,
-        "z": "84e7e3f2.6b184",
+        "x": 1033,
+        "y": 594,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "b3a5598e.a41448"
+                "380b3b11.1fc39c"
             ]
         ]
     },
     {
-        "id": "b3a5598e.a41448",
+        "id": "380b3b11.1fc39c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1244,
-        "y": 554,
-        "z": "84e7e3f2.6b184",
+        "x": 1259,
+        "y": 598,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "4e594d45.0e1984"
+                "6ce242f7.50a224"
             ]
         ]
     },
     {
-        "id": "4e594d45.0e1984",
+        "id": "6ce242f7.50a224",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1433.285888671875,
-        "y": 562.82177734375,
-        "z": "84e7e3f2.6b184",
+        "x": 1448.285888671875,
+        "y": 606.82177734375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "3e26d342.6174fc"
+                "8f0c299e.76aa68"
             ]
         ]
     },
     {
-        "id": "3e26d342.6174fc",
+        "id": "8f0c299e.76aa68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1608.117431640625,
-        "y": 565.3402709960938,
-        "z": "84e7e3f2.6b184",
+        "x": 1623.117431640625,
+        "y": 609.3402709960938,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "8d7c01bb.0e5ea",
-                "db36cb56.ed0998",
-                "9f8707c2.df5a68"
+                "9cc6d571.b014d8",
+                "8d29ebb2.4924b",
+                "1b814ca6.da0c53"
             ]
         ]
     },
     {
-        "id": "8d7c01bb.0e5ea",
+        "id": "9cc6d571.b014d8",
         "type": "set",
         "name": "set tmp.unis.uni[].tpId",
         "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",
         "comments": "",
-        "x": 1825.117431640625,
-        "y": 563.3402709960938,
-        "z": "84e7e3f2.6b184",
+        "x": 1840.117431640625,
+        "y": 607.3402709960938,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "b05ba34b.acc5f",
+        "id": "3fb86113.9bfd2e",
         "type": "switchNode",
-        "name": "switch number of unis  < 2",
-        "xml": "<switch test='`$tmp.unis.uni_length < 2`' >\n",
+        "name": "switch number of unis  less than two",
+        "xml": "<switch test='`$tmp.unis.uni_length &lt; 2`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 993,
-        "y": 714,
-        "z": "84e7e3f2.6b184",
+        "x": 1008,
+        "y": 758,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "9ad7b18c.9e2db"
+                "ca909120.1610f"
             ]
         ]
     },
     {
-        "id": "11a2c1f3.2f15de",
+        "id": "6807aab1.3361f4",
         "type": "returnSuccess",
         "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='' value='' />\n",
+        "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",
         "comments": "",
-        "x": 1401,
-        "y": 716,
-        "z": "84e7e3f2.6b184",
+        "x": 1416,
+        "y": 760,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "9ad7b18c.9e2db",
+        "id": "ca909120.1610f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1209,
-        "y": 715,
-        "z": "84e7e3f2.6b184",
+        "x": 1224,
+        "y": 759,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "11a2c1f3.2f15de"
+                "6807aab1.3361f4"
             ]
         ]
     },
     {
-        "id": "db36cb56.ed0998",
+        "id": "8d29ebb2.4924b",
         "type": "execute",
         "name": "execute split tpId to get pnf-name",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1864,
-        "y": 638,
-        "z": "84e7e3f2.6b184",
+        "x": 1879,
+        "y": 682,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "51f60529.b960dc",
-                "bd9180ed.9d6e6"
+                "8df25e56.70ef2",
+                "5281d33f.6cf23c"
             ]
         ]
     },
     {
-        "id": "bd9180ed.9d6e6",
+        "id": "5281d33f.6cf23c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087,
-        "y": 593,
-        "z": "84e7e3f2.6b184",
+        "x": 2102,
+        "y": 637,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "91a82817.a8c858"
+                "98c7bac7.1f7b2"
             ]
         ]
     },
     {
-        "id": "51f60529.b960dc",
+        "id": "8df25e56.70ef2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2089,
-        "y": 657,
-        "z": "84e7e3f2.6b184",
+        "x": 2104,
+        "y": 701,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "4dddc62b.304038"
+                "538dd561.19c994"
             ]
         ]
     },
     {
-        "id": "91a82817.a8c858",
+        "id": "98c7bac7.1f7b2",
         "type": "set",
         "name": "set ipAddress prefixLength",
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
         "comments": "",
-        "x": 2309,
-        "y": 595,
-        "z": "84e7e3f2.6b184",
+        "x": 2324,
+        "y": 639,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "4dddc62b.304038",
+        "id": "538dd561.19c994",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 2248,
-        "y": 676,
-        "z": "84e7e3f2.6b184",
+        "x": 2263,
+        "y": 720,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "9f8707c2.df5a68",
+        "id": "1b814ca6.da0c53",
         "type": "get-resource",
         "name": "get-resource pnf",
-        "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 AND depth = '0'`\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
+        "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' >-->",
         "comments": "",
         "outputs": 1,
-        "x": 1790,
-        "y": 731,
-        "z": "84e7e3f2.6b184",
+        "x": 1809,
+        "y": 819,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "7f07585.a7576a8"
+                "a9afb163.16d81"
             ]
         ]
     },
     {
-        "id": "7f07585.a7576a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1990.5,
-        "y": 749,
-        "z": "84e7e3f2.6b184",
-        "wires": [
-            [
-                "2018b1.62ea675"
-            ]
-        ]
-    },
-    {
-        "id": "2018b1.62ea675",
+        "id": "6d7469b.d065118",
         "type": "block",
         "name": "block",
-        "xml": "<block>\n",
+        "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2153.88232421875,
-        "y": 783.6556396484375,
-        "z": "84e7e3f2.6b184",
+        "x": 2168.88232421875,
+        "y": 827.6556396484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "a36c84bd.45b6f8",
-                "e1179ec.bdf3f6"
+                "d8ebfcdc.d7e228",
+                "e363b1ad.6cf518"
             ]
         ]
     },
     {
-        "id": "e1179ec.bdf3f6",
+        "id": "d8ebfcdc.d7e228",
         "type": "set",
         "name": "set node-id",
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].node-id`' value=\"`$tmp.aai.pnf.pnf-id`\" />\n",
         "comments": "",
-        "x": 2390,
-        "y": 734,
-        "z": "84e7e3f2.6b184",
+        "x": 2348,
+        "y": 781,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "a36c84bd.45b6f8",
+        "id": "e363b1ad.6cf518",
         "type": "for",
         "name": "for each relationship in pnf",
         "xml": "<for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2345.882568359375,
-        "y": 823.6597290039062,
-        "z": "84e7e3f2.6b184",
+        "x": 2360.882568359375,
+        "y": 867.6597290039062,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "c153c531.99c278"
+                "95c7940c.2b5948"
             ]
         ]
     },
     {
-        "id": "c153c531.99c278",
+        "id": "95c7940c.2b5948",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2571.882568359375,
-        "y": 823.6597290039062,
-        "z": "84e7e3f2.6b184",
+        "x": 2586.882568359375,
+        "y": 867.6597290039062,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "ebf22767.e2b168",
-                "17f20ef3.96aa91"
+                "a1776b53.b80d",
+                "af94fb8e.80dfb8"
             ]
         ]
     },
     {
-        "id": "ebf22767.e2b168",
+        "id": "af94fb8e.80dfb8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2770,
-        "y": 936,
-        "z": "84e7e3f2.6b184",
+        "x": 2785,
+        "y": 980,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "15e83210.af0fbe"
+                "127afd4b.34da43"
             ]
         ]
     },
     {
-        "id": "15e83210.af0fbe",
+        "id": "127afd4b.34da43",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2983,
-        "y": 937,
-        "z": "84e7e3f2.6b184",
+        "x": 2998,
+        "y": 981,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "7354a06a.e0a7c",
-                "82642fbf.6f96f"
+                "9a33ae38.4ad288",
+                "b1e1b5aa.ff6b18"
             ]
         ]
     },
     {
-        "id": "7354a06a.e0a7c",
+        "id": "9a33ae38.4ad288",
         "type": "set",
         "name": "set network-id",
         "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",
         "comments": "",
-        "x": 3218,
-        "y": 867,
-        "z": "84e7e3f2.6b184",
+        "x": 3233,
+        "y": 911,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "82642fbf.6f96f",
+        "id": "b1e1b5aa.ff6b18",
         "type": "get-resource",
         "name": "get-resource 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.unis.uni[$vidx].network-id AND depth = '0'`\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3226,
-        "y": 948,
-        "z": "84e7e3f2.6b184",
+        "x": 3241,
+        "y": 992,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "dfffc86d.811b38"
+                "7923986a.2dfdb"
             ]
         ]
     },
     {
-        "id": "dfffc86d.811b38",
+        "id": "7923986a.2dfdb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458.5,
-        "y": 944,
-        "z": "84e7e3f2.6b184",
+        "x": 3473.5,
+        "y": 988,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "c2666ab.b105298"
+                "e1de0e95.dce97"
             ]
         ]
     },
     {
-        "id": "c2666ab.b105298",
+        "id": "e1de0e95.dce97",
         "type": "set",
         "name": "set network-id, topo-id, client-id, etc",
         "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",
         "comments": "",
-        "x": 3727,
-        "y": 943,
-        "z": "84e7e3f2.6b184",
+        "x": 3742,
+        "y": 987,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "a53f3f0c.46a7a",
+        "id": "aeddedc2.f06158",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 782,
-        "y": 861,
-        "z": "84e7e3f2.6b184",
+        "x": 797,
+        "y": 905,
+        "z": "5c3e2071.30fcf",
         "wires": [
             []
         ]
     },
     {
-        "id": "17f20ef3.96aa91",
+        "id": "a1776b53.b80d",
         "type": "outcome",
         "name": "thirdparty-controller",
         "xml": "<outcome value='thirdparty-controller'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2797,
-        "y": 801,
-        "z": "84e7e3f2.6b184",
+        "x": 2812,
+        "y": 845,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "a15f639f.76c57"
+                "4c01f776.c87b7"
             ]
         ]
     },
     {
-        "id": "a15f639f.76c57",
+        "id": "4c01f776.c87b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3010,
-        "y": 802,
-        "z": "84e7e3f2.6b184",
+        "x": 3025,
+        "y": 846,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "94cd4673.029758"
+                "583e9b05.f6eef4"
             ]
         ]
     },
     {
-        "id": "94cd4673.029758",
+        "id": "583e9b05.f6eef4",
         "type": "set",
         "name": "set thirdparty-sdnc-id",
         "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",
         "comments": "",
-        "x": 3237,
-        "y": 801,
-        "z": "84e7e3f2.6b184",
+        "x": 3252,
+        "y": 845,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "5c2c3ff1.fc693",
+        "id": "d059a84d.8e506",
         "type": "comment",
         "name": "when we reach here, we have 2 UNIs, so do ACTN operations",
         "info": "",
         "comments": "",
-        "x": 795,
-        "y": 807,
-        "z": "84e7e3f2.6b184",
+        "x": 810,
+        "y": 851,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "c42e922f.1abaa",
+        "id": "f2975c47.fb694",
         "type": "for",
         "name": "for vidx..unis.uni_length[]",
         "xml": "<for index='vidx' start='0' end='`$tmp.unis.uni_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 648,
-        "y": 1053,
-        "z": "84e7e3f2.6b184",
+        "x": 663,
+        "y": 1097,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "1cfcb3ef.b12bfc"
+                "de539d0a.26596"
             ]
         ]
     },
     {
-        "id": "70ff03f1.58983c",
+        "id": "3b0a5525.2ac102",
         "type": "set",
         "name": "set oof.vpn",
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",
         "comments": "",
-        "x": 1074.0272216796875,
-        "y": 992.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1089.0272216796875,
+        "y": 1036.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "fcf606f6.efb428",
+        "id": "29b92baa.41f5cc",
         "type": "set",
         "name": "set controller data",
         "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",
         "comments": "",
-        "x": 1554.0272216796875,
-        "y": 1105.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1569.0272216796875,
+        "y": 1149.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "18d11459.dc281c",
+        "id": "82572a7a.757f1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1384.0272216796875,
-        "y": 1105.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1399.0272216796875,
+        "y": 1149.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "fcf606f6.efb428"
+                "29b92baa.41f5cc"
             ]
         ]
     },
     {
-        "id": "71856f9f.960fe",
+        "id": "7ff0b8e4.d0edd",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1388.0272216796875,
-        "y": 1145.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1403.0272216796875,
+        "y": 1189.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "48d45483.15892c"
+                "d2605932.de72d8"
             ]
         ]
     },
     {
-        "id": "f7967d43.ee995",
+        "id": "bcaaab5e.f760b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1380.0272216796875,
-        "y": 1185.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1395.0272216796875,
+        "y": 1229.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "8a5a416f.cf1fa"
+                "c5af9444.32cba8"
             ]
         ]
     },
     {
-        "id": "48d45483.15892c",
+        "id": "d2605932.de72d8",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1538.0272216796875,
-        "y": 1145.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1553.0272216796875,
+        "y": 1189.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "8a5a416f.cf1fa",
+        "id": "c5af9444.32cba8",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 1538.0272216796875,
-        "y": 1185.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1553.0272216796875,
+        "y": 1229.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "96b7c9e8.a8e308",
+        "id": "dc15d354.485648",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1384.0272216796875,
-        "y": 1225.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1399.0272216796875,
+        "y": 1269.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "f7f59d76.ec927"
+                "189365cc.5aa2da"
             ]
         ]
     },
     {
-        "id": "9f0248ba.15c698",
+        "id": "36cada17.d60606",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1380.0272216796875,
-        "y": 1265.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1395.0272216796875,
+        "y": 1309.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "66fab2ba.c9700c"
+                "436f764c.14ed4"
             ]
         ]
     },
     {
-        "id": "66fab2ba.c9700c",
+        "id": "436f764c.14ed4",
         "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 get token rest api\" />\n",
         "comments": "",
-        "x": 1538.0272216796875,
-        "y": 1265.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1553.0272216796875,
+        "y": 1309.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "f7f59d76.ec927",
+        "id": "189365cc.5aa2da",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 1534.5272216796875,
-        "y": 1225.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1549.5272216796875,
+        "y": 1269.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "98b0b441.82bf68",
+        "id": "bce6bff8.ae1f18",
         "type": "comment",
         "name": "Get controller info and send request",
         "info": "",
         "comments": "",
-        "x": 1146.0272216796875,
-        "y": 1105.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1161.0272216796875,
+        "y": 1149.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "82fd1dc6.67489",
+        "id": "8c2f104c.2ab35",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1138.0272216796875,
-        "y": 1145.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1153.0272216796875,
+        "y": 1189.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "18d11459.dc281c",
-                "71856f9f.960fe",
-                "f7967d43.ee995"
+                "82572a7a.757f1",
+                "7ff0b8e4.d0edd",
+                "bcaaab5e.f760b"
             ]
         ]
     },
     {
-        "id": "8222512c.b2b7f",
+        "id": "e9d11d4a.ea432",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1150.5272216796875,
-        "y": 1245.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 1165.5272216796875,
+        "y": 1289.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "96b7c9e8.a8e308",
-                "9f0248ba.15c698"
+                "dc15d354.485648",
+                "36cada17.d60606"
             ]
         ]
     },
     {
-        "id": "21e9ada7.141962",
+        "id": "81bac551.cc757",
         "type": "comment",
         "name": "call domain controller to  create underlay OTN tunnel",
         "info": "",
         "comments": "",
-        "x": 1199.5272216796875,
-        "y": 1330.49560546875,
-        "z": "84e7e3f2.6b184",
+        "x": 1214.5272216796875,
+        "y": 1374.49560546875,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "47386aa5.9bb954",
+        "id": "f9c270fa.7abd5",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-create-otn-tunnel",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1219.5272216796875,
-        "y": 1374.49560546875,
-        "z": "84e7e3f2.6b184",
+        "x": 1234.5272216796875,
+        "y": 1418.49560546875,
+        "z": "5c3e2071.30fcf",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cfcb3ef.b12bfc",
+        "id": "de539d0a.26596",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 801.5272216796875,
-        "y": 1385.0407409667969,
-        "z": "84e7e3f2.6b184",
+        "x": 816.5272216796875,
+        "y": 1429.0407409667969,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "82fd1dc6.67489",
-                "70ff03f1.58983c",
-                "e0cd8c60.4c6de",
-                "8b8f2197.efea1",
-                "8222512c.b2b7f",
-                "518a2698.5bffd8",
-                "47386aa5.9bb954"
+                "8c2f104c.2ab35",
+                "3b0a5525.2ac102",
+                "2c3edd05.477cca",
+                "543dd31e.1a6c4c",
+                "e9d11d4a.ea432",
+                "ab256b41.e2d9b8",
+                "f9c270fa.7abd5"
             ]
         ]
     },
     {
-        "id": "cbbfd612.33a888",
+        "id": "641e0b16.a7aa44",
         "type": "comment",
         "name": "Loop through UNIs and configure domain controllers",
         "info": "",
         "comments": "",
-        "x": 736.5003662109375,
-        "y": 1193.5003662109375,
-        "z": "84e7e3f2.6b184",
+        "x": 751.5003662109375,
+        "y": 1237.5003662109375,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "e0cd8c60.4c6de",
+        "id": "2c3edd05.477cca",
         "type": "set",
         "name": "set sotn_value",
         "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' />",
         "comments": "",
-        "x": 1065.52734375,
-        "y": 1453.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1080.52734375,
+        "y": 1497.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "8b8f2197.efea1",
+        "id": "543dd31e.1a6c4c",
         "type": "set",
         "name": "set attachment_param",
         "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",
         "comments": "",
-        "x": 1090.02734375,
-        "y": 1493.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1105.02734375,
+        "y": 1537.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "518a2698.5bffd8",
+        "id": "ab256b41.e2d9b8",
         "type": "switchNode",
         "name": "switch prop.sdncRestApi.token_id",
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.52734375,
-        "y": 1533.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1140.52734375,
+        "y": 1577.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "7015f66c.94fd18",
-                "82d35da9.66aaf"
+                "7aea425d.d2ac8c",
+                "c6896fdc.d8f088"
             ]
         ]
     },
     {
-        "id": "dd59a6d0.4b0dc8",
+        "id": "e7a0edea.212a28",
         "type": "execute",
         "name": "execute RestconfApiCallNode Create ethernet Service with token",
         "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1642.52734375,
-        "y": 1553.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1657.52734375,
+        "y": 1597.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "f3736e9e.60052",
-                "c00d7e66.d88b7"
+                "dc79f422.6ffec8",
+                "fce6e76c.ef0f5"
             ]
         ]
     },
     {
-        "id": "f3736e9e.60052",
+        "id": "dc79f422.6ffec8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986.02734375,
-        "y": 1553.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 2001.02734375,
+        "y": 1597.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "113a662f.cf308a"
+                "e78610af.f485d"
             ]
         ]
     },
     {
-        "id": "113a662f.cf308a",
+        "id": "e78610af.f485d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2143.52734375,
-        "y": 1553.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 2158.52734375,
+        "y": 1597.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             []
         ]
     },
     {
-        "id": "9be7bcfb.b7fdc",
+        "id": "3c748274.94d126",
         "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 Create vpn rest api\" />\n",
         "comments": "",
-        "x": 2140.02734375,
-        "y": 1513.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 2155.02734375,
+        "y": 1557.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": []
     },
     {
-        "id": "c00d7e66.d88b7",
+        "id": "fce6e76c.ef0f5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1982.02734375,
-        "y": 1513.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1997.02734375,
+        "y": 1557.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "9be7bcfb.b7fdc"
+                "3c748274.94d126"
             ]
         ]
     },
     {
-        "id": "7015f66c.94fd18",
+        "id": "7aea425d.d2ac8c",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1338.3711738586426,
-        "y": 1513.162670135498,
-        "z": "84e7e3f2.6b184",
+        "x": 1353.3711738586426,
+        "y": 1557.162670135498,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "d88a1a72.f911d8"
+                "7a6c581b.b1ed5"
             ]
         ]
     },
     {
-        "id": "82d35da9.66aaf",
+        "id": "c6896fdc.d8f088",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1342.02734375,
-        "y": 1553.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1357.02734375,
+        "y": 1597.040771484375,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "dd59a6d0.4b0dc8"
+                "e7a0edea.212a28"
             ]
         ]
     },
     {
-        "id": "d88a1a72.f911d8",
+        "id": "7a6c581b.b1ed5",
         "type": "execute",
         "name": "execute RestconfApiCallNode Create ethernet Service without token",
         "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\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1652.52734375,
-        "y": 1513.040771484375,
-        "z": "84e7e3f2.6b184",
+        "x": 1667.52734375,
+        "y": 1557.040771484375,
+        "z": "5c3e2071.30fcf",
+        "wires": [
+            [
+                "fce6e76c.ef0f5",
+                "dc79f422.6ffec8"
+            ]
+        ]
+    },
+    {
+        "id": "25602afb.1d9cfe",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 722,
+        "y": 672,
+        "z": "5c3e2071.30fcf",
+        "wires": [
+            [
+                "8bfca5dd.ccec38"
+            ]
+        ]
+    },
+    {
+        "id": "a9afb163.16d81",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1992,
+        "y": 826,
+        "z": "5c3e2071.30fcf",
         "wires": [
             [
-                "c00d7e66.d88b7",
-                "f3736e9e.60052"
+                "6d7469b.d065118"
             ]
         ]
     }
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 f2598166..191456bd 100644
--- 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 @@
 [
     {
-        "id": "e9f5d8f7.e285a8",
+        "id": "41bcd68b.3b187",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 83.47266006469727,
-        "y": 26,
-        "z": "8abb02c9.ea909",
+        "x": 117,
+        "y": 66,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "f361420f.d2dd5"
+                "68ff8d75.08d6bc"
             ]
         ]
     },
     {
-        "id": "f361420f.d2dd5",
+        "id": "68ff8d75.08d6bc",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,601 +22,600 @@
         "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": 214.75835037231445,
-        "y": 75.23810863494873,
-        "z": "8abb02c9.ea909",
+        "x": 248.2856903076172,
+        "y": 115.23810863494873,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "83b54aea.5a2e08"
+                "e9c8e7da.08db58"
             ]
         ]
     },
     {
-        "id": "83b54aea.5a2e08",
+        "id": "e9c8e7da.08db58",
         "type": "method",
         "name": "method sotn-vf-operation-uni-create",
         "xml": "<method rpc='sotn-vf-operation-uni-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 217.9012794494629,
-        "y": 160.00003242492676,
-        "z": "8abb02c9.ea909",
+        "x": 251.42861938476562,
+        "y": 200.00003242492676,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "d23ea373.2facb"
+                "9b876278.69aec"
             ]
         ]
     },
     {
-        "id": "129ae0d2.67909f",
+        "id": "b6719136.d1d408",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 592,
-        "y": 45,
-        "z": "8abb02c9.ea909",
+        "x": 625.5273399353027,
+        "y": 85,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "4518c55e.2af6cc"
+                "de455676.bfc4b8"
             ]
         ]
     },
     {
-        "id": "4518c55e.2af6cc",
+        "id": "de455676.bfc4b8",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 778.6666793823242,
-        "y": 44.33329772949219,
-        "z": "8abb02c9.ea909",
+        "x": 812.194019317627,
+        "y": 84.33329772949219,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "49f6673c.896c38"
+                "caff06c1.7f0ea8"
             ]
         ]
     },
     {
-        "id": "49f6673c.896c38",
+        "id": "caff06c1.7f0ea8",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 960.3333053588867,
-        "y": 44.33329772949219,
-        "z": "8abb02c9.ea909",
+        "x": 993.8606452941895,
+        "y": 84.33329772949219,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "344a6d66.006ae2",
+        "id": "2806a3d2.9200ac",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.5794200897217,
-        "y": 99.50003504753113,
-        "z": "8abb02c9.ea909",
+        "x": 615.1067600250244,
+        "y": 139.50003504753113,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "b740b835.934dd8"
+                "baaa4638.c65"
             ]
         ]
     },
     {
-        "id": "b740b835.934dd8",
+        "id": "baaa4638.c65",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 832.5795154571533,
-        "y": 95.16665554046631,
-        "z": "8abb02c9.ea909",
+        "x": 866.106855392456,
+        "y": 135.1666555404663,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "7d8c54e9.05fcdc"
+                "ac6af028.e56f6"
             ]
         ]
     },
     {
-        "id": "7d8c54e9.05fcdc",
+        "id": "ac6af028.e56f6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050.9128322601318,
-        "y": 97.1666374206543,
-        "z": "8abb02c9.ea909",
+        "x": 1084.4401721954346,
+        "y": 137.1666374206543,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "4090d448.987d9c"
+                "8e9b59f5.9fbff8"
             ]
         ]
     },
     {
-        "id": "4090d448.987d9c",
+        "id": "8e9b59f5.9fbff8",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1204.2460041046143,
-        "y": 97.16665840148926,
-        "z": "8abb02c9.ea909",
+        "x": 1237.773344039917,
+        "y": 137.16665840148926,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "d6f734d6.542738",
+        "id": "e32594d8.14f33",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 595.579439163208,
-        "y": 160.5000331401825,
-        "z": "8abb02c9.ea909",
+        "x": 629.1067790985107,
+        "y": 200.5000331401825,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "cc5e7b73.313338"
+                "5097b64f.8e649"
             ]
         ]
     },
     {
-        "id": "cc5e7b73.313338",
+        "id": "5097b64f.8e649",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 757.5794849395752,
-        "y": 159.50003218650818,
-        "z": "8abb02c9.ea909",
+        "x": 791.1068248748779,
+        "y": 199.50003218650818,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "d5e799c5.aa66e8"
+                "f8a1475e.8d7dc8"
             ]
         ]
     },
     {
-        "id": "d5e799c5.aa66e8",
+        "id": "f8a1475e.8d7dc8",
         "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=\"vnf id not found in service-data\" />\n",
         "comments": "",
-        "x": 906.8295764923096,
-        "y": 157.27790999412537,
-        "z": "8abb02c9.ea909",
+        "x": 940.3569164276123,
+        "y": 197.27790999412537,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "2e3b155c.1acdba",
+        "id": "7c723171.97826",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 630.2500219345093,
-        "y": 221.99999403953552,
-        "z": "8abb02c9.ea909",
+        "x": 663.777361869812,
+        "y": 261.9999940395355,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "d6b8c302.00cb5",
-                "74fd2b9a.39bbc4"
+                "d3dcde48.41f3",
+                "9c9a7796.629b6"
             ]
         ]
     },
     {
-        "id": "d6b8c302.00cb5",
+        "id": "d3dcde48.41f3",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 861.2500324249268,
-        "y": 197.99999117851257,
-        "z": "8abb02c9.ea909",
+        "x": 894.7773723602295,
+        "y": 237.99999117851257,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "b130c62a.6d5b28"
+                "eb2b3da4.ac3bf"
             ]
         ]
     },
     {
-        "id": "74fd2b9a.39bbc4",
+        "id": "9c9a7796.629b6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 861.2500324249268,
-        "y": 237.99999117851257,
-        "z": "8abb02c9.ea909",
+        "x": 894.7773723602295,
+        "y": 277.9999911785126,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "aa20e5dd.34f068"
+                "9e326ce7.36ba2"
             ]
         ]
     },
     {
-        "id": "b130c62a.6d5b28",
+        "id": "eb2b3da4.ac3bf",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",
         "comments": "",
-        "x": 1003.7500324249268,
-        "y": 197.99999117851257,
-        "z": "8abb02c9.ea909",
+        "x": 1037.2773723602295,
+        "y": 237.99999117851257,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "aa20e5dd.34f068",
+        "id": "9e326ce7.36ba2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1005.6070766448975,
-        "y": 237.93650317192078,
-        "z": "8abb02c9.ea909",
+        "x": 1039.1344165802002,
+        "y": 277.9365031719208,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "290ec3b5.b78dec",
-                "ba0b306b.1384c"
+                "bb4f26d0.2b52f8",
+                "c6144a09.68351"
             ]
         ]
     },
     {
-        "id": "ba0b306b.1384c",
+        "id": "c6144a09.68351",
         "type": "set",
         "name": "set vf-index",
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
         "comments": "",
-        "x": 1158.3055515289307,
-        "y": 207.55560186458752,
-        "z": "8abb02c9.ea909",
+        "x": 1191.8328914642334,
+        "y": 247.55560186458752,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "290ec3b5.b78dec",
+        "id": "bb4f26d0.2b52f8",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1214.7340564727783,
-        "y": 260.7777316570282,
-        "z": "8abb02c9.ea909",
+        "x": 1248.261396408081,
+        "y": 300.7777316570282,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "f5468be4.2d7768"
+                "cadc9be5.e759e"
             ]
         ]
     },
     {
-        "id": "55b24f6b.1c68",
+        "id": "fcf618d7.ce2b98",
         "type": "comment",
         "name": "make sure this network doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1438.384786605835,
-        "y": 219.03178906440735,
-        "z": "8abb02c9.ea909",
+        "x": 1471.9121265411377,
+        "y": 259.03178906440735,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "f5468be4.2d7768",
+        "id": "cadc9be5.e759e",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1490.0197772979736,
-        "y": 260.3492343425751,
-        "z": "8abb02c9.ea909",
+        "x": 1523.5471172332764,
+        "y": 300.3492343425751,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "416b188c.9635e8"
+                "c1e99eff.0e5d48"
             ]
         ]
     },
     {
-        "id": "416b188c.9635e8",
+        "id": "c1e99eff.0e5d48",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1390.7499752044678,
-        "y": 318.9206655025482,
-        "z": "8abb02c9.ea909",
+        "x": 1424.2773151397705,
+        "y": 358.9206655025482,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "5ff9d421.bc0c2c"
+                "840dd033.d02e68"
             ]
         ]
     },
     {
-        "id": "5ff9d421.bc0c2c",
+        "id": "840dd033.d02e68",
         "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=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",
         "comments": "",
-        "x": 1538.500078201294,
-        "y": 318.7778575713746,
-        "z": "8abb02c9.ea909",
+        "x": 1572.0274181365967,
+        "y": 358.7778575713746,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "a3005c7c.22f1c",
+        "id": "425e7a20.0b25dc",
         "type": "comment",
         "name": "Take the parameter names by removing prefix",
         "info": "",
         "comments": "",
-        "x": 674.8297939300537,
-        "y": 294.8294517993927,
-        "z": "8abb02c9.ea909",
+        "x": 708.3571338653564,
+        "y": 334.8294517993927,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "c2f9b109.0e45",
+        "id": "26fdcf88.d41188",
         "type": "for",
         "name": "for loop idx - VF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 636.8295917510986,
-        "y": 338.16278433799744,
-        "z": "8abb02c9.ea909",
+        "x": 670.3569316864014,
+        "y": 378.16278433799744,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "c2930fc2.e5909"
+                "d2a88646.f84f6"
             ]
         ]
     },
     {
-        "id": "c2930fc2.e5909",
+        "id": "d2a88646.f84f6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 851.6079349517822,
-        "y": 335.71836829185486,
-        "z": "8abb02c9.ea909",
+        "x": 885.135274887085,
+        "y": 375.71836829185486,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "d1ed645d.aa3a78",
-                "6dcf8b92.c77424"
+                "6ee856f3.a6b1a",
+                "7919b72e.9e665"
             ]
         ]
     },
     {
-        "id": "d1ed645d.aa3a78",
+        "id": "6ee856f3.a6b1a",
         "type": "execute",
         "name": "execute split parameterName",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1047.8641376495361,
-        "y": 313.46650671958923,
-        "z": "8abb02c9.ea909",
+        "x": 1081.3914775848389,
+        "y": 353.46650671958923,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             []
         ]
     },
     {
-        "id": "6dcf8b92.c77424",
+        "id": "7919b72e.9e665",
         "type": "set",
         "name": "set parameterName",
         "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",
         "comments": "",
-        "x": 1017.3085651397705,
-        "y": 350.46662306785583,
-        "z": "8abb02c9.ea909",
+        "x": 1050.8359050750732,
+        "y": 390.46662306785583,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "d23ea373.2facb",
+        "id": "9b876278.69aec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 290.5794315338135,
-        "y": 355.4961154460907,
-        "z": "8abb02c9.ea909",
+        "x": 324.1067714691162,
+        "y": 395.4961154460907,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "c2f9b109.0e45",
-                "129ae0d2.67909f",
-                "2e3b155c.1acdba",
-                "a11f77d.859bf88",
-                "7c53c20f.68b9dc",
-                "42215efb.1d8e4",
-                "91211121.8f53",
-                "d001c737.a47218",
-                "b74ff3ee.b1d98",
-                "344a6d66.006ae2",
-                "d6f734d6.542738",
-                "3cca5aeb.576896",
-                "6ba0a91d.74fdb8",
-                "c0fe8566.aad758",
-                "3368b1eb.e464fe",
-                "29fa2ed2.416422"
+                "26fdcf88.d41188",
+                "b6719136.d1d408",
+                "7c723171.97826",
+                "6c8900d6.0d8e58",
+                "49bfdced.7c2bbc",
+                "bf7bb77.41be8c8",
+                "abc1f25f.e43c08",
+                "8c309fdb.0398f",
+                "91a89d7a.a0f178",
+                "2806a3d2.9200ac",
+                "e32594d8.14f33",
+                "2b448345.aa142c",
+                "d1e54672.f82058",
+                "abd09dc6.c02b78",
+                "4b4cd818.a8df08",
+                "a0154eab.2fbc7"
             ]
         ]
     },
     {
-        "id": "d001c737.a47218",
+        "id": "8c309fdb.0398f",
         "type": "returnSuccess",
         "name": "return success",
         "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",
         "comments": "",
-        "x": 577.8019104003906,
-        "y": 893.00732421875,
-        "z": "8abb02c9.ea909",
+        "x": 611.3292503356934,
+        "y": 933.00732421875,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "91211121.8f53",
+        "id": "abc1f25f.e43c08",
         "type": "save",
         "name": "save service relationship in AAI",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 633.0794067382812,
-        "y": 851.83349609375,
-        "z": "8abb02c9.ea909",
+        "x": 666.606746673584,
+        "y": 891.83349609375,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             []
         ]
     },
     {
-        "id": "42215efb.1d8e4",
+        "id": "bf7bb77.41be8c8",
         "type": "save",
         "name": "save uni resource in AAI",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 615.0794677734375,
-        "y": 747.83349609375,
-        "z": "8abb02c9.ea909",
+        "x": 648.6068077087402,
+        "y": 787.83349609375,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             []
         ]
     },
     {
-        "id": "b74ff3ee.b1d98",
+        "id": "91a89d7a.a0f178",
         "type": "set",
         "name": "set vf-module-level-oper-status",
         "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",
         "comments": "",
-        "x": 632.579439163208,
-        "y": 698.5000331401825,
-        "z": "8abb02c9.ea909",
+        "x": 666.1067790985107,
+        "y": 738.5000331401825,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "7c53c20f.68b9dc",
+        "id": "49bfdced.7c2bbc",
         "type": "set",
         "name": "set vf-module-object-path",
         "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",
         "comments": "",
-        "x": 616.079475402832,
-        "y": 656.3335154056549,
-        "z": "8abb02c9.ea909",
+        "x": 649.6068153381348,
+        "y": 696.3335154056549,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "a11f77d.859bf88",
+        "id": "6c8900d6.0d8e58",
         "type": "set",
         "name": "copy input data to service data",
         "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",
         "comments": "",
-        "x": 627.9325504302979,
-        "y": 604.8296692371368,
-        "z": "8abb02c9.ea909",
+        "x": 661.4598903656006,
+        "y": 644.8296692371368,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "c0fe8566.aad758",
+        "id": "abd09dc6.c02b78",
         "type": "set",
         "name": "set new vf-module_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",
         "comments": "",
-        "x": 608,
-        "y": 497,
-        "z": "8abb02c9.ea909",
+        "x": 641.5273399353027,
+        "y": 537,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "3cca5aeb.576896",
+        "id": "2b448345.aa142c",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",
         "comments": "",
-        "x": 614.9995880126953,
-        "y": 391.9912657737732,
-        "z": "8abb02c9.ea909",
+        "x": 648.526927947998,
+        "y": 431.9912657737732,
+        "z": "c1f3ee3d.7e867",
         "wires": []
     },
     {
-        "id": "6ba0a91d.74fdb8",
+        "id": "d1e54672.f82058",
         "type": "call",
         "name": "call sotn-get-vf-module-uni-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-vf-module-uni-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 653.8132629394531,
-        "y": 444.83709144592285,
-        "z": "8abb02c9.ea909",
+        "x": 687.3406028747559,
+        "y": 484.83709144592285,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             []
         ]
     },
     {
-        "id": "3368b1eb.e464fe",
+        "id": "4b4cd818.a8df08",
         "type": "execute",
         "name": "execute generate-vf-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 606.8132781982422,
-        "y": 553.3409690856934,
-        "z": "8abb02c9.ea909",
+        "x": 640.3406181335449,
+        "y": 593.3409690856934,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             []
         ]
     },
     {
-        "id": "29fa2ed2.416422",
+        "id": "a0154eab.2fbc7",
         "type": "get-resource",
         "name": "get-resource generic-vnf",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 605,
-        "y": 803,
-        "z": "8abb02c9.ea909",
+        "x": 638.5273399353027,
+        "y": 843,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "5c744e64.d3743"
+                "288ce8e3.088cd"
             ]
         ]
     },
     {
-        "id": "5c744e64.d3743",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "42b83e22.53c9",
+        "type": "set",
+        "name": "set tmp.relationship_length",
+        "xml": "<set>\n<parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",
+        "comments": "",
+        "x": 1154.52734375,
+        "y": 801,
+        "z": "c1f3ee3d.7e867",
+        "wires": []
+    },
+    {
+        "id": "288ce8e3.088cd",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 808,
-        "y": 798,
-        "z": "8abb02c9.ea909",
+        "x": 868,
+        "y": 821,
+        "z": "c1f3ee3d.7e867",
         "wires": [
             [
-                "79532ac9.38abe4"
+                "42b83e22.53c9"
             ]
         ]
-    },
-    {
-        "id": "79532ac9.38abe4",
-        "type": "set",
-        "name": "set tmp.relationship_length",
-        "xml": "<set>\n<parameter name=\"tmp.relationship_length\" value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",
-        "comments": "",
-        "x": 991,
-        "y": 795,
-        "z": "8abb02c9.ea909",
-        "wires": []
     }
 ]
\ No newline at end of file
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 c1e677ba..ec76dae8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -74,87 +74,98 @@
 		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
 		AND depth = '0'"
         pfx='tmp.aai.generic-vnf' local-only='false' >
-                <block>
-                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
-                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                            <outcome value='uni'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
-                                    </set>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                        <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
-                                        <parameter name="regex" value="nodeId"/>
-                                        <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
-                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='' />
-                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                            </return>
-                                        </outcome>
-                                    </execute>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                        <outcome value='success'>
-                                            <block>
+                <outcome value='success'>
+                    <block>
+                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
+                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                <outcome value='uni'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
+                                            <parameter name="regex" value="nodeId"/>
+                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
+                                            <outcome value='success'>
                                                 <set>
-                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
+                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
                                                 </set>
-                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
-                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                        <outcome value='thirdparty-controller'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='network-resource'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                </set>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                            </outcome>
+                                            <outcome value='failure'>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='' />
+                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                            <!--		resource="generic-vnf" -->
+                                            <!--		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
+                                            <!--		AND depth = '0'"-->
+                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->
+                                            <outcome value='success'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                    </set>
+                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
+                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                                            <outcome value='thirdparty-controller'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                    </set>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='network-resource'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="network-resource" 
-		key="`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`"
+		key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'
+		AND depth = '0'"
         pfx='tmp.aai.network-resource' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <set>
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </get-resource>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </get-resource>
-                                </block>
+                                                                        <outcome value='success'>
+                                                                            <set>
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </for>
+                                                </block>
+                                            </outcome>
+                                        </get-resource>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.unis.uni_length &lt; 2`' >
+                            <outcome value='true'>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
                             </outcome>
                         </switch>
-                    </for>
-                    <switch test='`$tmp.unis.uni_length < 2`' >
-                        <outcome value='true'>
-                            <return status='success'>
-                                <parameter name='' value='' />
-                            </return>
-                        </outcome>
-                    </switch>
-                </block>
+                    </block>
+                </outcome>
             </get-resource>
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
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 a549708d..e582fb7e 100644
--- 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
@@ -129,11 +129,11 @@
 		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
 		AND depth = '0'"
         pfx='tmp.aai.generic-vnf' local-only='false' >
-                <block>
+                <outcome value='success'>
                     <set>
-                        <parameter name="tmp.relationship_length" value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>
+                        <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>
                     </set>
-                </block>
+                </outcome>
             </get-resource>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 
-- 
2.16.6