X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json;h=658a04cdf53c1bd07a029b49ccb2027c577a0b7c;hp=b8646972515f02132b99ab178c6b7e132a538d58;hb=f515a8831e0036414d69d73030e871dec88180f8;hpb=1df36cd2a20f26dfa1c80bc5c3baaa03140f1987

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