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

Former-commit-id: c247d4afcf452ff84bc3e748aaa999b161203179

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 81ac687..b864697 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "fb32b655.b185b8",\r
+        "id": "ea193d8f.e165e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 97,\r
-        "y": 26,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 112,\r
+        "y": 70,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "84e0c1e1.45193"\r
+                "45143e5e.12cef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84e0c1e1.45193",\r
+        "id": "45143e5e.12cef",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,1316 +22,1332 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 228.2856903076172,\r
-        "y": 75.23810863494873,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 243.2856903076172,\r
+        "y": 119.23810863494873,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "45da7482.2ad22c"\r
+                "22fb039d.719e1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45da7482.2ad22c",\r
+        "id": "22fb039d.719e1c",\r
         "type": "method",\r
         "name": "method sotn-vf-operation-uni-activate",\r
         "xml": "<method rpc='sotn-vf-operation-uni-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 231.42861938476562,\r
-        "y": 160.00003242492676,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 246.42861938476562,\r
+        "y": 204.00003242492676,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "edcc85d8.9d3d28"\r
+                "bbe79441.cda0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c9ee1fb.c2a40e",\r
+        "id": "8dca40ca.b6cbc8",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 703.9959564208984,\r
-        "y": 340.99998915195465,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 718.9959564208984,\r
+        "y": 384.99998915195465,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "a85389a5.eba5b8",\r
-                "b56c9993.d26ec8",\r
-                "d2286cfd.202a6"\r
+                "66f88853.0801a8",\r
+                "5f34a2a5.ce0fbc",\r
+                "37779f9b.3e84f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edcc85d8.9d3d28",\r
+        "id": "bbe79441.cda0b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 322.6626205444336,\r
-        "y": 445.66670763492584,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 337.6626205444336,\r
+        "y": 489.66670763492584,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "2c9ee1fb.c2a40e",\r
-                "fa8ab78.8a0bc48",\r
-                "83723db3.8501b",\r
-                "943ab36c.4be4",\r
-                "56a2543.f406bac",\r
-                "7638ccf.06d4134",\r
-                "a53f3f0c.46a7a",\r
-                "c42e922f.1abaa"\r
+                "8dca40ca.b6cbc8",\r
+                "b28368bd.88b17",\r
+                "91b62864.f184c8",\r
+                "b0f3fc53.5db61",\r
+                "b5422f78.9d3e4",\r
+                "f2975c47.fb694",\r
+                "aeddedc2.f06158",\r
+                "5950f717.b81e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83723db3.8501b",\r
+        "id": "91b62864.f184c8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 669.0273170471191,\r
-        "y": 211.269144654274,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 684.0273170471191,\r
+        "y": 255.269144654274,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "b6860278.b7c3a"\r
+                "3d5e06d8.9791c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa8ab78.8a0bc48",\r
+        "id": "b28368bd.88b17",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 673.9959716796875,\r
-        "y": 150.00001394748688,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 688.9959716796875,\r
+        "y": 194.00001394748688,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "4d78f4ba.adcf7c"\r
+                "746b74df.fbc48c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d78f4ba.adcf7c",\r
+        "id": "746b74df.fbc48c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 853.9959526062012,\r
-        "y": 149.0000034570694,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 868.9959526062012,\r
+        "y": 193.0000034570694,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "83071b4.81cf8e8"\r
+                "62ebea71.fce5b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83071b4.81cf8e8",\r
+        "id": "62ebea71.fce5b4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1003.4246788024902,\r
-        "y": 150.14292109012604,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1018.4246788024902,\r
+        "y": 194.14292109012604,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6860278.b7c3a",\r
+        "id": "3d5e06d8.9791c2",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 891.9959678649902,\r
-        "y": 212.00000965595245,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 906.9959678649902,\r
+        "y": 256.00000965595245,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "a420300f.fcc77"\r
+                "fccff52.827ec08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a420300f.fcc77",\r
+        "id": "fccff52.827ec08",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106.9959526062012,\r
-        "y": 210.0000034570694,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1121.9959526062012,\r
+        "y": 254.0000034570694,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "61f2940f.e1eccc"\r
+                "fc0c6263.7f4b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ebe199d.38e1f8",\r
+        "id": "46df70e6.cbb32",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1447.9959716796875,\r
-        "y": 178,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1462.9959716796875,\r
+        "y": 222,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b56c9993.d26ec8",\r
+        "id": "5f34a2a5.ce0fbc",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963.9959716796875,\r
-        "y": 365,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 978.9959716796875,\r
+        "y": 409,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "f74bba14.018558"\r
+                "b65ac05a.92d3b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a85389a5.eba5b8",\r
+        "id": "66f88853.0801a8",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 960.9959716796875,\r
-        "y": 293,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 975.9959716796875,\r
+        "y": 337,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "f74bba14.018558"\r
+                "b65ac05a.92d3b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f74bba14.018558",\r
+        "id": "b65ac05a.92d3b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1132.9959716796875,\r
-        "y": 327,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1147.9959716796875,\r
+        "y": 371,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2286cfd.202a6",\r
+        "id": "37779f9b.3e84f8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 925.9959487915039,\r
-        "y": 435.9999986886978,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 940.9959487915039,\r
+        "y": 479.9999986886978,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "1141c0c2.8446df"\r
+                "8619e619.b5b6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd0fe0b8.95c3d",\r
+        "id": "b4807db5.ce3f18",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1279.995964050293,\r
-        "y": 434.0000126361847,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1294.995964050293,\r
+        "y": 478.0000126361847,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1141c0c2.8446df",\r
+        "id": "8619e619.b5b6f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1086.995994567871,\r
-        "y": 432.99999010562897,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1101.995994567871,\r
+        "y": 476.99999010562897,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "bd0fe0b8.95c3d",\r
-                "7d4d8763.0f4718"\r
+                "b4807db5.ce3f18",\r
+                "b7112b63.fa666"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d4d8763.0f4718",\r
+        "id": "b7112b63.fa666",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1298.9959335327148,\r
-        "y": 486.99998915195465,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1313.9959335327148,\r
+        "y": 530.9999891519547,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "39d7ac61.94fef4"\r
+                "207d79b0.f0396e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39d7ac61.94fef4",\r
+        "id": "207d79b0.f0396e",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1541.995948791504,\r
-        "y": 481.9999986886978,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1556.995948791504,\r
+        "y": 525.9999986886978,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "1b63e74a.2edd39"\r
+                "f2b976ec.55b34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b63e74a.2edd39",\r
+        "id": "f2b976ec.55b34",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1739.9959774017334,\r
-        "y": 469.00000536441803,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1754.9959774017334,\r
+        "y": 513.000005364418,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "21b15a7e.281f96"\r
+                "eab205c1.ee7e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21b15a7e.281f96",\r
+        "id": "eab205c1.ee7e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1891.995948791504,\r
-        "y": 470.9999986886978,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1906.995948791504,\r
+        "y": 514.9999986886978,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "bfa5b77e.850078",\r
-                "9791123.9d23ff",\r
-                "5999c8a4.0563c8"\r
+                "7cce5705.9b51",\r
+                "b161a727.31db88",\r
+                "8cc64f67.5de4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfa5b77e.850078",\r
+        "id": "7cce5705.9b51",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2119.996063232422,\r
-        "y": 413.0000025033951,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2134.996063232422,\r
+        "y": 457.0000025033951,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9791123.9d23ff",\r
+        "id": "b161a727.31db88",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2123.996063232422,\r
-        "y": 467.0000025033951,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2138.996063232422,\r
+        "y": 511.0000025033951,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "943ab36c.4be4",\r
+        "id": "b0f3fc53.5db61",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 597.9961547851562,\r
-        "y": 1640.501220703125,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 612.9961547851562,\r
+        "y": 1684.501220703125,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5999c8a4.0563c8",\r
+        "id": "8cc64f67.5de4c",\r
         "type": "call",\r
         "name": "call sotn-get-vf-module-uni-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2154.45108795166,\r
-        "y": 518.0104948282242,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2169.45108795166,\r
+        "y": 562.0104948282242,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "56a2543.f406bac",\r
+        "id": "b5422f78.9d3e4",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 683.9959564208984,\r
-        "y": 280.5039049386978,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 698.9959564208984,\r
+        "y": 324.5039049386978,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "61f2940f.e1eccc",\r
+        "id": "fc0c6263.7f4b58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1270,\r
-        "y": 220,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1285,\r
+        "y": 264,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "5ebe199d.38e1f8",\r
-                "97c5cadc.46fd38"\r
+                "46df70e6.cbb32",\r
+                "868e2384.9bd088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97c5cadc.46fd38",\r
+        "id": "868e2384.9bd088",\r
         "type": "set",\r
         "name": "set tmp.vnf-id",\r
         "xml": "<set>\n<parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 1455,\r
-        "y": 235,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1470,\r
+        "y": 279,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7638ccf.06d4134",\r
+        "id": "5950f717.b81e28",\r
         "type": "get-resource",\r
         "name": "get-resource generic-vnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.generic-vnf' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 603,\r
-        "y": 552,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 591,\r
+        "y": 543,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "6951bd2b.63d4e4"\r
+                "25602afb.1d9cfe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6951bd2b.63d4e4",\r
+        "id": "8bfca5dd.ccec38",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 806,\r
-        "y": 547,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 821,\r
+        "y": 591,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "c98c270d.88dcd8",\r
-                "b05ba34b.acc5f"\r
+                "3fb86113.9bfd2e",\r
+                "cea6f99d.9fa3f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c98c270d.88dcd8",\r
+        "id": "cea6f99d.9fa3f8",\r
         "type": "for",\r
         "name": "for each relationship in gen-vnf",\r
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1018,\r
-        "y": 550,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1033,\r
+        "y": 594,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "b3a5598e.a41448"\r
+                "380b3b11.1fc39c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3a5598e.a41448",\r
+        "id": "380b3b11.1fc39c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1244,\r
-        "y": 554,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1259,\r
+        "y": 598,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "4e594d45.0e1984"\r
+                "6ce242f7.50a224"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e594d45.0e1984",\r
+        "id": "6ce242f7.50a224",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1433.285888671875,\r
-        "y": 562.82177734375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1448.285888671875,\r
+        "y": 606.82177734375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "3e26d342.6174fc"\r
+                "8f0c299e.76aa68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e26d342.6174fc",\r
+        "id": "8f0c299e.76aa68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1608.117431640625,\r
-        "y": 565.3402709960938,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1623.117431640625,\r
+        "y": 609.3402709960938,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "8d7c01bb.0e5ea",\r
-                "db36cb56.ed0998",\r
-                "9f8707c2.df5a68"\r
+                "9cc6d571.b014d8",\r
+                "8d29ebb2.4924b",\r
+                "1b814ca6.da0c53"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d7c01bb.0e5ea",\r
+        "id": "9cc6d571.b014d8",\r
         "type": "set",\r
         "name": "set tmp.unis.uni[].tpId",\r
         "xml": "<set>\n<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n\n",\r
         "comments": "",\r
-        "x": 1825.117431640625,\r
-        "y": 563.3402709960938,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1840.117431640625,\r
+        "y": 607.3402709960938,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b05ba34b.acc5f",\r
+        "id": "3fb86113.9bfd2e",\r
         "type": "switchNode",\r
-        "name": "switch number of unis  < 2",\r
-        "xml": "<switch test='`$tmp.unis.uni_length < 2`' >\n",\r
+        "name": "switch number of unis  less than two",\r
+        "xml": "<switch test='`$tmp.unis.uni_length &lt; 2`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993,\r
-        "y": 714,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1008,\r
+        "y": 758,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "9ad7b18c.9e2db"\r
+                "ca909120.1610f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11a2c1f3.2f15de",\r
+        "id": "6807aab1.3361f4",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='' value='' />\n",\r
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n\n",\r
         "comments": "",\r
-        "x": 1401,\r
-        "y": 716,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1416,\r
+        "y": 760,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ad7b18c.9e2db",\r
+        "id": "ca909120.1610f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1209,\r
-        "y": 715,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1224,\r
+        "y": 759,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "11a2c1f3.2f15de"\r
+                "6807aab1.3361f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db36cb56.ed0998",\r
+        "id": "8d29ebb2.4924b",\r
         "type": "execute",\r
         "name": "execute split tpId to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`tmp.unis.uni[$vidx].tpId`'/>\n<parameter name=\"regex\" value=\"nodeId\"/>\n<parameter name=\"tmp.unis.uni[$vidx].pnf-name\" value=\"\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1864,\r
-        "y": 638,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1879,\r
+        "y": 682,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "51f60529.b960dc",\r
-                "bd9180ed.9d6e6"\r
+                "8df25e56.70ef2",\r
+                "5281d33f.6cf23c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd9180ed.9d6e6",\r
+        "id": "5281d33f.6cf23c",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2087,\r
-        "y": 593,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2102,\r
+        "y": 637,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "91a82817.a8c858"\r
+                "98c7bac7.1f7b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51f60529.b960dc",\r
+        "id": "8df25e56.70ef2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2089,\r
-        "y": 657,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2104,\r
+        "y": 701,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "4dddc62b.304038"\r
+                "538dd561.19c994"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91a82817.a8c858",\r
+        "id": "98c7bac7.1f7b2",\r
         "type": "set",\r
         "name": "set ipAddress prefixLength",\r
         "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",\r
         "comments": "",\r
-        "x": 2309,\r
-        "y": 595,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2324,\r
+        "y": 639,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4dddc62b.304038",\r
+        "id": "538dd561.19c994",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 2248,\r
-        "y": 676,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2263,\r
+        "y": 720,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f8707c2.df5a68",\r
+        "id": "1b814ca6.da0c53",\r
         "type": "get-resource",\r
         "name": "get-resource pnf",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\t\tresource=\"generic-vnf\" -->\n<!--\t\tkey=\"'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n<!--\t\tAND depth = '0'\"-->\n<!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1790,\r
-        "y": 731,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1809,\r
+        "y": 819,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "7f07585.a7576a8"\r
+                "a9afb163.16d81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f07585.a7576a8",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1990.5,\r
-        "y": 749,\r
-        "z": "84e7e3f2.6b184",\r
-        "wires": [\r
-            [\r
-                "2018b1.62ea675"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2018b1.62ea675",\r
+        "id": "6d7469b.d065118",\r
         "type": "block",\r
         "name": "block",\r
-        "xml": "<block>\n",\r
+        "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2153.88232421875,\r
-        "y": 783.6556396484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2168.88232421875,\r
+        "y": 827.6556396484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "a36c84bd.45b6f8",\r
-                "e1179ec.bdf3f6"\r
+                "d8ebfcdc.d7e228",\r
+                "e363b1ad.6cf518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1179ec.bdf3f6",\r
+        "id": "d8ebfcdc.d7e228",\r
         "type": "set",\r
         "name": "set node-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].node-id`' value=\"`$tmp.aai.pnf.pnf-id`\" />\n",\r
         "comments": "",\r
-        "x": 2390,\r
-        "y": 734,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2348,\r
+        "y": 781,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a36c84bd.45b6f8",\r
+        "id": "e363b1ad.6cf518",\r
         "type": "for",\r
         "name": "for each relationship in pnf",\r
         "xml": "<for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2345.882568359375,\r
-        "y": 823.6597290039062,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2360.882568359375,\r
+        "y": 867.6597290039062,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "c153c531.99c278"\r
+                "95c7940c.2b5948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c153c531.99c278",\r
+        "id": "95c7940c.2b5948",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2571.882568359375,\r
-        "y": 823.6597290039062,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2586.882568359375,\r
+        "y": 867.6597290039062,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "ebf22767.e2b168",\r
-                "17f20ef3.96aa91"\r
+                "a1776b53.b80d",\r
+                "af94fb8e.80dfb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf22767.e2b168",\r
+        "id": "af94fb8e.80dfb8",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2770,\r
-        "y": 936,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2785,\r
+        "y": 980,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "15e83210.af0fbe"\r
+                "127afd4b.34da43"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15e83210.af0fbe",\r
+        "id": "127afd4b.34da43",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2983,\r
-        "y": 937,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2998,\r
+        "y": 981,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "7354a06a.e0a7c",\r
-                "82642fbf.6f96f"\r
+                "9a33ae38.4ad288",\r
+                "b1e1b5aa.ff6b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7354a06a.e0a7c",\r
+        "id": "9a33ae38.4ad288",\r
         "type": "set",\r
         "name": "set network-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].network-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3218,\r
-        "y": 867,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3233,\r
+        "y": 911,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82642fbf.6f96f",\r
+        "id": "b1e1b5aa.ff6b18",\r
         "type": "get-resource",\r
         "name": "get-resource network-resource",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3226,\r
-        "y": 948,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3241,\r
+        "y": 992,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "dfffc86d.811b38"\r
+                "7923986a.2dfdb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfffc86d.811b38",\r
+        "id": "7923986a.2dfdb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3458.5,\r
-        "y": 944,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3473.5,\r
+        "y": 988,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "c2666ab.b105298"\r
+                "e1de0e95.dce97"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2666ab.b105298",\r
+        "id": "e1de0e95.dce97",\r
         "type": "set",\r
         "name": "set network-id, topo-id, client-id, etc",\r
         "xml": "<set>\n<parameter name=\"`$tmp.unis.uni[$vidx].network-id`\" value=\"`$tmp.aai.network-resource.network-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].provider-id`\" value=\"`$tmp.aai.network-resource.provider-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].client-id`\" value=\"`$tmp.aai.network-resource.client-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].te-topo-id`\" value=\"`$tmp.aai.network-resource.te-topo-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].network-type`\" value=\"`$tmp.aai.network-resource.network-type`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 3727,\r
-        "y": 943,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3742,\r
+        "y": 987,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a53f3f0c.46a7a",\r
+        "id": "aeddedc2.f06158",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782,\r
-        "y": 861,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 797,\r
+        "y": 905,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "17f20ef3.96aa91",\r
+        "id": "a1776b53.b80d",\r
         "type": "outcome",\r
         "name": "thirdparty-controller",\r
         "xml": "<outcome value='thirdparty-controller'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2797,\r
-        "y": 801,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2812,\r
+        "y": 845,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "a15f639f.76c57"\r
+                "4c01f776.c87b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a15f639f.76c57",\r
+        "id": "4c01f776.c87b7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3010,\r
-        "y": 802,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3025,\r
+        "y": 846,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "94cd4673.029758"\r
+                "583e9b05.f6eef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94cd4673.029758",\r
+        "id": "583e9b05.f6eef4",\r
         "type": "set",\r
         "name": "set thirdparty-sdnc-id",\r
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3237,\r
-        "y": 801,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 3252,\r
+        "y": 845,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c2c3ff1.fc693",\r
+        "id": "d059a84d.8e506",\r
         "type": "comment",\r
         "name": "when we reach here, we have 2 UNIs, so do ACTN operations",\r
         "info": "",\r
         "comments": "",\r
-        "x": 795,\r
-        "y": 807,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 810,\r
+        "y": 851,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c42e922f.1abaa",\r
+        "id": "f2975c47.fb694",\r
         "type": "for",\r
         "name": "for vidx..unis.uni_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$tmp.unis.uni_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 648,\r
-        "y": 1053,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 663,\r
+        "y": 1097,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "1cfcb3ef.b12bfc"\r
+                "de539d0a.26596"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70ff03f1.58983c",\r
+        "id": "3b0a5525.2ac102",\r
         "type": "set",\r
         "name": "set oof.vpn",\r
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",\r
         "comments": "",\r
-        "x": 1074.0272216796875,\r
-        "y": 992.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1089.0272216796875,\r
+        "y": 1036.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fcf606f6.efb428",\r
+        "id": "29b92baa.41f5cc",\r
         "type": "set",\r
         "name": "set controller data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",\r
         "comments": "",\r
-        "x": 1554.0272216796875,\r
-        "y": 1105.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1569.0272216796875,\r
+        "y": 1149.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18d11459.dc281c",\r
+        "id": "82572a7a.757f1",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1384.0272216796875,\r
-        "y": 1105.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1399.0272216796875,\r
+        "y": 1149.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "fcf606f6.efb428"\r
+                "29b92baa.41f5cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71856f9f.960fe",\r
+        "id": "7ff0b8e4.d0edd",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1388.0272216796875,\r
-        "y": 1145.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1403.0272216796875,\r
+        "y": 1189.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "48d45483.15892c"\r
+                "d2605932.de72d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7967d43.ee995",\r
+        "id": "bcaaab5e.f760b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1380.0272216796875,\r
-        "y": 1185.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1395.0272216796875,\r
+        "y": 1229.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "8a5a416f.cf1fa"\r
+                "c5af9444.32cba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48d45483.15892c",\r
+        "id": "d2605932.de72d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1538.0272216796875,\r
-        "y": 1145.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1553.0272216796875,\r
+        "y": 1189.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8a5a416f.cf1fa",\r
+        "id": "c5af9444.32cba8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1538.0272216796875,\r
-        "y": 1185.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1553.0272216796875,\r
+        "y": 1229.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96b7c9e8.a8e308",\r
+        "id": "dc15d354.485648",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1384.0272216796875,\r
-        "y": 1225.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1399.0272216796875,\r
+        "y": 1269.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "f7f59d76.ec927"\r
+                "189365cc.5aa2da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f0248ba.15c698",\r
+        "id": "36cada17.d60606",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1380.0272216796875,\r
-        "y": 1265.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1395.0272216796875,\r
+        "y": 1309.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "66fab2ba.c9700c"\r
+                "436f764c.14ed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66fab2ba.c9700c",\r
+        "id": "436f764c.14ed4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",\r
         "comments": "",\r
-        "x": 1538.0272216796875,\r
-        "y": 1265.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1553.0272216796875,\r
+        "y": 1309.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7f59d76.ec927",\r
+        "id": "189365cc.5aa2da",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1534.5272216796875,\r
-        "y": 1225.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1549.5272216796875,\r
+        "y": 1269.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98b0b441.82bf68",\r
+        "id": "bce6bff8.ae1f18",\r
         "type": "comment",\r
         "name": "Get controller info and send request",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1146.0272216796875,\r
-        "y": 1105.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1161.0272216796875,\r
+        "y": 1149.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82fd1dc6.67489",\r
+        "id": "8c2f104c.2ab35",\r
         "type": "get-resource",\r
         "name": "get-resource esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $oof.vpn.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1138.0272216796875,\r
-        "y": 1145.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1153.0272216796875,\r
+        "y": 1189.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "18d11459.dc281c",\r
-                "71856f9f.960fe",\r
-                "f7967d43.ee995"\r
+                "82572a7a.757f1",\r
+                "7ff0b8e4.d0edd",\r
+                "bcaaab5e.f760b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8222512c.b2b7f",\r
+        "id": "e9d11d4a.ea432",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1150.5272216796875,\r
-        "y": 1245.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1165.5272216796875,\r
+        "y": 1289.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "96b7c9e8.a8e308",\r
-                "9f0248ba.15c698"\r
+                "dc15d354.485648",\r
+                "36cada17.d60606"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21e9ada7.141962",\r
+        "id": "81bac551.cc757",\r
         "type": "comment",\r
         "name": "call domain controller to  create underlay OTN tunnel",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1199.5272216796875,\r
-        "y": 1330.49560546875,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1214.5272216796875,\r
+        "y": 1374.49560546875,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47386aa5.9bb954",\r
+        "id": "f9c270fa.7abd5",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-create-otn-tunnel",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1219.5272216796875,\r
-        "y": 1374.49560546875,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1234.5272216796875,\r
+        "y": 1418.49560546875,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1cfcb3ef.b12bfc",\r
+        "id": "de539d0a.26596",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 801.5272216796875,\r
-        "y": 1385.0407409667969,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 816.5272216796875,\r
+        "y": 1429.0407409667969,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "82fd1dc6.67489",\r
-                "70ff03f1.58983c",\r
-                "e0cd8c60.4c6de",\r
-                "8b8f2197.efea1",\r
-                "8222512c.b2b7f",\r
-                "518a2698.5bffd8",\r
-                "47386aa5.9bb954"\r
+                "8c2f104c.2ab35",\r
+                "3b0a5525.2ac102",\r
+                "2c3edd05.477cca",\r
+                "543dd31e.1a6c4c",\r
+                "e9d11d4a.ea432",\r
+                "ab256b41.e2d9b8",\r
+                "f9c270fa.7abd5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbbfd612.33a888",\r
+        "id": "641e0b16.a7aa44",\r
         "type": "comment",\r
         "name": "Loop through UNIs and configure domain controllers",\r
         "info": "",\r
         "comments": "",\r
-        "x": 736.5003662109375,\r
-        "y": 1193.5003662109375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 751.5003662109375,\r
+        "y": 1237.5003662109375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e0cd8c60.4c6de",\r
+        "id": "2c3edd05.477cca",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",\r
         "comments": "",\r
-        "x": 1065.52734375,\r
-        "y": 1453.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1080.52734375,\r
+        "y": 1497.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b8f2197.efea1",\r
+        "id": "543dd31e.1a6c4c",\r
         "type": "set",\r
         "name": "set attachment_param",\r
         "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n",\r
         "comments": "",\r
-        "x": 1090.02734375,\r
-        "y": 1493.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1105.02734375,\r
+        "y": 1537.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "518a2698.5bffd8",\r
+        "id": "ab256b41.e2d9b8",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncRestApi.token_id",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1125.52734375,\r
-        "y": 1533.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1140.52734375,\r
+        "y": 1577.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "7015f66c.94fd18",\r
-                "82d35da9.66aaf"\r
+                "7aea425d.d2ac8c",\r
+                "c6896fdc.d8f088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd59a6d0.4b0dc8",\r
+        "id": "e7a0edea.212a28",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Create ethernet Service with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1642.52734375,\r
-        "y": 1553.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1657.52734375,\r
+        "y": 1597.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "f3736e9e.60052",\r
-                "c00d7e66.d88b7"\r
+                "dc79f422.6ffec8",\r
+                "fce6e76c.ef0f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3736e9e.60052",\r
+        "id": "dc79f422.6ffec8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1986.02734375,\r
-        "y": 1553.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2001.02734375,\r
+        "y": 1597.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "113a662f.cf308a"\r
+                "e78610af.f485d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "113a662f.cf308a",\r
+        "id": "e78610af.f485d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2143.52734375,\r
-        "y": 1553.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2158.52734375,\r
+        "y": 1597.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9be7bcfb.b7fdc",\r
+        "id": "3c748274.94d126",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "x": 2140.02734375,\r
-        "y": 1513.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 2155.02734375,\r
+        "y": 1557.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c00d7e66.d88b7",\r
+        "id": "fce6e76c.ef0f5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1982.02734375,\r
-        "y": 1513.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1997.02734375,\r
+        "y": 1557.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "9be7bcfb.b7fdc"\r
+                "3c748274.94d126"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7015f66c.94fd18",\r
+        "id": "7aea425d.d2ac8c",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1338.3711738586426,\r
-        "y": 1513.162670135498,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1353.3711738586426,\r
+        "y": 1557.162670135498,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "d88a1a72.f911d8"\r
+                "7a6c581b.b1ed5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82d35da9.66aaf",\r
+        "id": "c6896fdc.d8f088",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1342.02734375,\r
-        "y": 1553.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1357.02734375,\r
+        "y": 1597.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "dd59a6d0.4b0dc8"\r
+                "e7a0edea.212a28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d88a1a72.f911d8",\r
+        "id": "7a6c581b.b1ed5",\r
         "type": "execute",\r
         "name": "execute RestconfApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1652.52734375,\r
-        "y": 1513.040771484375,\r
-        "z": "84e7e3f2.6b184",\r
+        "x": 1667.52734375,\r
+        "y": 1557.040771484375,\r
+        "z": "5c3e2071.30fcf",\r
+        "wires": [\r
+            [\r
+                "fce6e76c.ef0f5",\r
+                "dc79f422.6ffec8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "25602afb.1d9cfe",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 722,\r
+        "y": 672,\r
+        "z": "5c3e2071.30fcf",\r
+        "wires": [\r
+            [\r
+                "8bfca5dd.ccec38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9afb163.16d81",\r
+        "type": "failure",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1992,\r
+        "y": 826,\r
+        "z": "5c3e2071.30fcf",\r
         "wires": [\r
             [\r
-                "c00d7e66.d88b7",\r
-                "f3736e9e.60052"\r
+                "6d7469b.d065118"\r
             ]\r
         ]\r
     }\r

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 f259816..191456b 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "e9f5d8f7.e285a8",\r
+        "id": "41bcd68b.3b187",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 83.47266006469727,\r
-        "y": 26,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 117,\r
+        "y": 66,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "f361420f.d2dd5"\r
+                "68ff8d75.08d6bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f361420f.d2dd5",\r
+        "id": "68ff8d75.08d6bc",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,601 +22,600 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 214.75835037231445,\r
-        "y": 75.23810863494873,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 248.2856903076172,\r
+        "y": 115.23810863494873,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "83b54aea.5a2e08"\r
+                "e9c8e7da.08db58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83b54aea.5a2e08",\r
+        "id": "e9c8e7da.08db58",\r
         "type": "method",\r
         "name": "method sotn-vf-operation-uni-create",\r
         "xml": "<method rpc='sotn-vf-operation-uni-create' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 217.9012794494629,\r
-        "y": 160.00003242492676,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 251.42861938476562,\r
+        "y": 200.00003242492676,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "d23ea373.2facb"\r
+                "9b876278.69aec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "129ae0d2.67909f",\r
+        "id": "b6719136.d1d408",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592,\r
-        "y": 45,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 625.5273399353027,\r
+        "y": 85,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "4518c55e.2af6cc"\r
+                "de455676.bfc4b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4518c55e.2af6cc",\r
+        "id": "de455676.bfc4b8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.6666793823242,\r
-        "y": 44.33329772949219,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 812.194019317627,\r
+        "y": 84.33329772949219,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "49f6673c.896c38"\r
+                "caff06c1.7f0ea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49f6673c.896c38",\r
+        "id": "caff06c1.7f0ea8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs in MD-SAL\" />\n",\r
         "comments": "",\r
-        "x": 960.3333053588867,\r
-        "y": 44.33329772949219,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 993.8606452941895,\r
+        "y": 84.33329772949219,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "344a6d66.006ae2",\r
+        "id": "2806a3d2.9200ac",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.5794200897217,\r
-        "y": 99.50003504753113,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 615.1067600250244,\r
+        "y": 139.50003504753113,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "b740b835.934dd8"\r
+                "baaa4638.c65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b740b835.934dd8",\r
+        "id": "baaa4638.c65",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 832.5795154571533,\r
-        "y": 95.16665554046631,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 866.106855392456,\r
+        "y": 135.1666555404663,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "7d8c54e9.05fcdc"\r
+                "ac6af028.e56f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d8c54e9.05fcdc",\r
+        "id": "ac6af028.e56f6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1050.9128322601318,\r
-        "y": 97.1666374206543,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1084.4401721954346,\r
+        "y": 137.1666374206543,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "4090d448.987d9c"\r
+                "8e9b59f5.9fbff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4090d448.987d9c",\r
+        "id": "8e9b59f5.9fbff8",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1204.2460041046143,\r
-        "y": 97.16665840148926,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1237.773344039917,\r
+        "y": 137.16665840148926,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6f734d6.542738",\r
+        "id": "e32594d8.14f33",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 595.579439163208,\r
-        "y": 160.5000331401825,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 629.1067790985107,\r
+        "y": 200.5000331401825,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "cc5e7b73.313338"\r
+                "5097b64f.8e649"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc5e7b73.313338",\r
+        "id": "5097b64f.8e649",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 757.5794849395752,\r
-        "y": 159.50003218650818,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 791.1068248748779,\r
+        "y": 199.50003218650818,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "d5e799c5.aa66e8"\r
+                "f8a1475e.8d7dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5e799c5.aa66e8",\r
+        "id": "f8a1475e.8d7dc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 906.8295764923096,\r
-        "y": 157.27790999412537,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 940.3569164276123,\r
+        "y": 197.27790999412537,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e3b155c.1acdba",\r
+        "id": "7c723171.97826",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 630.2500219345093,\r
-        "y": 221.99999403953552,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 663.777361869812,\r
+        "y": 261.9999940395355,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "d6b8c302.00cb5",\r
-                "74fd2b9a.39bbc4"\r
+                "d3dcde48.41f3",\r
+                "9c9a7796.629b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6b8c302.00cb5",\r
+        "id": "d3dcde48.41f3",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.2500324249268,\r
-        "y": 197.99999117851257,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 894.7773723602295,\r
+        "y": 237.99999117851257,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "b130c62a.6d5b28"\r
+                "eb2b3da4.ac3bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74fd2b9a.39bbc4",\r
+        "id": "9c9a7796.629b6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.2500324249268,\r
-        "y": 237.99999117851257,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 894.7773723602295,\r
+        "y": 277.9999911785126,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "aa20e5dd.34f068"\r
+                "9e326ce7.36ba2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b130c62a.6d5b28",\r
+        "id": "eb2b3da4.ac3bf",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1003.7500324249268,\r
-        "y": 197.99999117851257,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1037.2773723602295,\r
+        "y": 237.99999117851257,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa20e5dd.34f068",\r
+        "id": "9e326ce7.36ba2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1005.6070766448975,\r
-        "y": 237.93650317192078,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1039.1344165802002,\r
+        "y": 277.9365031719208,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "290ec3b5.b78dec",\r
-                "ba0b306b.1384c"\r
+                "bb4f26d0.2b52f8",\r
+                "c6144a09.68351"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba0b306b.1384c",\r
+        "id": "c6144a09.68351",\r
         "type": "set",\r
         "name": "set vf-index",\r
         "xml": "<set>\n<parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 1158.3055515289307,\r
-        "y": 207.55560186458752,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1191.8328914642334,\r
+        "y": 247.55560186458752,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "290ec3b5.b78dec",\r
+        "id": "bb4f26d0.2b52f8",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-index`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1214.7340564727783,\r
-        "y": 260.7777316570282,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1248.261396408081,\r
+        "y": 300.7777316570282,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "f5468be4.2d7768"\r
+                "cadc9be5.e759e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55b24f6b.1c68",\r
+        "id": "fcf618d7.ce2b98",\r
         "type": "comment",\r
         "name": "make sure this network doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1438.384786605835,\r
-        "y": 219.03178906440735,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1471.9121265411377,\r
+        "y": 259.03178906440735,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5468be4.2d7768",\r
+        "id": "cadc9be5.e759e",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1490.0197772979736,\r
-        "y": 260.3492343425751,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1523.5471172332764,\r
+        "y": 300.3492343425751,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "416b188c.9635e8"\r
+                "c1e99eff.0e5d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "416b188c.9635e8",\r
+        "id": "c1e99eff.0e5d48",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1390.7499752044678,\r
-        "y": 318.9206655025482,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1424.2773151397705,\r
+        "y": 358.9206655025482,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "5ff9d421.bc0c2c"\r
+                "840dd033.d02e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ff9d421.bc0c2c",\r
+        "id": "840dd033.d02e68",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1538.500078201294,\r
-        "y": 318.7778575713746,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1572.0274181365967,\r
+        "y": 358.7778575713746,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3005c7c.22f1c",\r
+        "id": "425e7a20.0b25dc",\r
         "type": "comment",\r
         "name": "Take the parameter names by removing prefix",\r
         "info": "",\r
         "comments": "",\r
-        "x": 674.8297939300537,\r
-        "y": 294.8294517993927,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 708.3571338653564,\r
+        "y": 334.8294517993927,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2f9b109.0e45",\r
+        "id": "26fdcf88.d41188",\r
         "type": "for",\r
         "name": "for loop idx - VF input parameters",\r
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 636.8295917510986,\r
-        "y": 338.16278433799744,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 670.3569316864014,\r
+        "y": 378.16278433799744,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "c2930fc2.e5909"\r
+                "d2a88646.f84f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2930fc2.e5909",\r
+        "id": "d2a88646.f84f6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 851.6079349517822,\r
-        "y": 335.71836829185486,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 885.135274887085,\r
+        "y": 375.71836829185486,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "d1ed645d.aa3a78",\r
-                "6dcf8b92.c77424"\r
+                "6ee856f3.a6b1a",\r
+                "7919b72e.9e665"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1ed645d.aa3a78",\r
+        "id": "6ee856f3.a6b1a",\r
         "type": "execute",\r
         "name": "execute split parameterName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1047.8641376495361,\r
-        "y": 313.46650671958923,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1081.3914775848389,\r
+        "y": 353.46650671958923,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6dcf8b92.c77424",\r
+        "id": "7919b72e.9e665",\r
         "type": "set",\r
         "name": "set parameterName",\r
         "xml": "<set>\n<parameter name=\"`vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",\r
         "comments": "",\r
-        "x": 1017.3085651397705,\r
-        "y": 350.46662306785583,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 1050.8359050750732,\r
+        "y": 390.46662306785583,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d23ea373.2facb",\r
+        "id": "9b876278.69aec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 290.5794315338135,\r
-        "y": 355.4961154460907,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 324.1067714691162,\r
+        "y": 395.4961154460907,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "c2f9b109.0e45",\r
-                "129ae0d2.67909f",\r
-                "2e3b155c.1acdba",\r
-                "a11f77d.859bf88",\r
-                "7c53c20f.68b9dc",\r
-                "42215efb.1d8e4",\r
-                "91211121.8f53",\r
-                "d001c737.a47218",\r
-                "b74ff3ee.b1d98",\r
-                "344a6d66.006ae2",\r
-                "d6f734d6.542738",\r
-                "3cca5aeb.576896",\r
-                "6ba0a91d.74fdb8",\r
-                "c0fe8566.aad758",\r
-                "3368b1eb.e464fe",\r
-                "29fa2ed2.416422"\r
+                "26fdcf88.d41188",\r
+                "b6719136.d1d408",\r
+                "7c723171.97826",\r
+                "6c8900d6.0d8e58",\r
+                "49bfdced.7c2bbc",\r
+                "bf7bb77.41be8c8",\r
+                "abc1f25f.e43c08",\r
+                "8c309fdb.0398f",\r
+                "91a89d7a.a0f178",\r
+                "2806a3d2.9200ac",\r
+                "e32594d8.14f33",\r
+                "2b448345.aa142c",\r
+                "d1e54672.f82058",\r
+                "abd09dc6.c02b78",\r
+                "4b4cd818.a8df08",\r
+                "a0154eab.2fbc7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d001c737.a47218",\r
+        "id": "8c309fdb.0398f",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 577.8019104003906,\r
-        "y": 893.00732421875,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 611.3292503356934,\r
+        "y": 933.00732421875,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91211121.8f53",\r
+        "id": "abc1f25f.e43c08",\r
         "type": "save",\r
         "name": "save service relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \n      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-to`\" value=\"uni\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].related-link`\" value=\"`'/network/unis/uni/' + $prop.vf-id`\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`\" value=\"id\" />\n<parameter name=\"`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`\" value=\"`$prop.vf-id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 633.0794067382812,\r
-        "y": 851.83349609375,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 666.606746673584,\r
+        "y": 891.83349609375,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "42215efb.1d8e4",\r
+        "id": "bf7bb77.41be8c8",\r
         "type": "save",\r
         "name": "save uni resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $prop.vf-id' >\n<parameter name=\"id\" value=\"`$prop.vf-id`\" />\n<parameter name=\"tpId\" value='`$prop.uni.tpId`' />\n<parameter name='cVLAN' value='`$prop.uni.vlanId`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 615.0794677734375,\r
-        "y": 747.83349609375,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 648.6068077087402,\r
+        "y": 787.83349609375,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b74ff3ee.b1d98",\r
+        "id": "91a89d7a.a0f178",\r
         "type": "set",\r
         "name": "set vf-module-level-oper-status",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",\r
         "comments": "",\r
-        "x": 632.579439163208,\r
-        "y": 698.5000331401825,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 666.1067790985107,\r
+        "y": 738.5000331401825,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c53c20f.68b9dc",\r
+        "id": "49bfdced.7c2bbc",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-id' value='`$prop.vf-id`'/> \n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 616.079475402832,\r
-        "y": 656.3335154056549,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 649.6068153381348,\r
+        "y": 696.3335154056549,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a11f77d.859bf88",\r
+        "id": "6c8900d6.0d8e58",\r
         "type": "set",\r
         "name": "copy input data to service data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\n",\r
         "comments": "",\r
-        "x": 627.9325504302979,\r
-        "y": 604.8296692371368,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 661.4598903656006,\r
+        "y": 644.8296692371368,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0fe8566.aad758",\r
+        "id": "abd09dc6.c02b78",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />",\r
         "comments": "",\r
-        "x": 608,\r
-        "y": 497,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 641.5273399353027,\r
+        "y": 537,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3cca5aeb.576896",\r
+        "id": "2b448345.aa142c",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\n",\r
         "comments": "",\r
-        "x": 614.9995880126953,\r
-        "y": 391.9912657737732,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 648.526927947998,\r
+        "y": 431.9912657737732,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ba0a91d.74fdb8",\r
+        "id": "d1e54672.f82058",\r
         "type": "call",\r
         "name": "call sotn-get-vf-module-uni-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-vf-module-uni-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 653.8132629394531,\r
-        "y": 444.83709144592285,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 687.3406028747559,\r
+        "y": 484.83709144592285,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3368b1eb.e464fe",\r
+        "id": "4b4cd818.a8df08",\r
         "type": "execute",\r
         "name": "execute generate-vf-id",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vf-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 606.8132781982422,\r
-        "y": 553.3409690856934,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 640.3406181335449,\r
+        "y": 593.3409690856934,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "29fa2ed2.416422",\r
+        "id": "a0154eab.2fbc7",\r
         "type": "get-resource",\r
         "name": "get-resource generic-vnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.generic-vnf' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 605,\r
-        "y": 803,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 638.5273399353027,\r
+        "y": 843,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "5c744e64.d3743"\r
+                "288ce8e3.088cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c744e64.d3743",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "id": "42b83e22.53c9",\r
+        "type": "set",\r
+        "name": "set tmp.relationship_length",\r
+        "xml": "<set>\n<parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",\r
+        "comments": "",\r
+        "x": 1154.52734375,\r
+        "y": 801,\r
+        "z": "c1f3ee3d.7e867",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "288ce8e3.088cd",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 808,\r
-        "y": 798,\r
-        "z": "8abb02c9.ea909",\r
+        "x": 868,\r
+        "y": 821,\r
+        "z": "c1f3ee3d.7e867",\r
         "wires": [\r
             [\r
-                "79532ac9.38abe4"\r
+                "42b83e22.53c9"\r
             ]\r
         ]\r
-    },\r
-    {\r
-        "id": "79532ac9.38abe4",\r
-        "type": "set",\r
-        "name": "set tmp.relationship_length",\r
-        "xml": "<set>\n<parameter name=\"tmp.relationship_length\" value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\n",\r
-        "comments": "",\r
-        "x": 991,\r
-        "y": 795,\r
-        "z": "8abb02c9.ea909",\r
-        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-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 c1e677b..ec76dae 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -74,87 +74,98 @@
                key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
                AND depth = '0'"\r
         pfx='tmp.aai.generic-vnf' local-only='false' >\r
-                <block>\r
-                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
-                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                            <outcome value='uni'>\r
-                                <block atomic="true">\r
-                                    <set>\r
-                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
-                                    </set>\r
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                        <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
-                                        <parameter name="regex" value="nodeId"/>\r
-                                        <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                        <outcome value='failure'>\r
-                                            <return status='failure'>\r
-                                                <parameter name='error-code' value='' />\r
-                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
-                                            </return>\r
-                                        </outcome>\r
-                                    </execute>\r
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`"\r
-        pfx='tmp.aai.pnf' local-only='false' >\r
-                                        <outcome value='success'>\r
-                                            <block>\r
+                <outcome value='success'>\r
+                    <block>\r
+                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
+                            <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                                <outcome value='uni'>\r
+                                    <block atomic="true">\r
+                                        <set>\r
+                                            <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>\r
+                                            <parameter name="regex" value="nodeId"/>\r
+                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>\r
+                                            <outcome value='success'>\r
                                                 <set>\r
-                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
+                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
                                                 </set>\r
-                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
-                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                        <outcome value='thirdparty-controller'>\r
-                                                            <block atomic="true">\r
-                                                                <set>\r
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                </set>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                        <outcome value='network-resource'>\r
-                                                            <block atomic="true">\r
-                                                                <set>\r
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
-                                                                </set>\r
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                            </outcome>\r
+                                            <outcome value='failure'>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='error-code' value='' />\r
+                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                        </execute>\r
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="pnf" \r
+               key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\r
+               AND depth = '0'"\r
+        pfx='tmp.aai.pnf' local-only='false' >\r
+                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
+                                            <!--               resource="generic-vnf" -->\r
+                                            <!--               key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
+                                            <!--               AND depth = '0'"-->\r
+                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->\r
+                                            <outcome value='success'>\r
+                                                <block>\r
+                                                    <set>\r
+                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                    </set>\r
+                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
+                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
+                                                            <outcome value='thirdparty-controller'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                    </set>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                            <outcome value='network-resource'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                    </set>\r
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="network-resource" \r
-               key="`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`"\r
+               key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\r
+               AND depth = '0'"\r
         pfx='tmp.aai.network-resource' local-only='false' >\r
-                                                                    <outcome value='success'>\r
-                                                                        <set>\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
-                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                </get-resource>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                    </switch>\r
-                                                </for>\r
-                                            </block>\r
-                                        </outcome>\r
-                                    </get-resource>\r
-                                </block>\r
+                                                                        <outcome value='success'>\r
+                                                                            <set>\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
+                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
+                                                                            </set>\r
+                                                                        </outcome>\r
+                                                                    </get-resource>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
+                                                </block>\r
+                                            </outcome>\r
+                                        </get-resource>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </for>\r
+                        <switch test='`$tmp.unis.uni_length &lt; 2`' >\r
+                            <outcome value='true'>\r
+                                <return status='success'>\r
+                                    <parameter name="ack-final-indicator" value="Y" />\r
+                                    <parameter name="error-code" value="200" />\r
+                                    <parameter name="error-message" value="`$error-message`" />\r
+                                </return>\r
                             </outcome>\r
                         </switch>\r
-                    </for>\r
-                    <switch test='`$tmp.unis.uni_length < 2`' >\r
-                        <outcome value='true'>\r
-                            <return status='success'>\r
-                                <parameter name='' value='' />\r
-                            </return>\r
-                        </outcome>\r
-                    </switch>\r
-                </block>\r
+                    </block>\r
+                </outcome>\r
             </get-resource>\r
             <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
             <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
index a549708..e582fb7 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
@@ -129,11 +129,11 @@
                key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
                AND depth = '0'"\r
         pfx='tmp.aai.generic-vnf' local-only='false' >\r
-                <block>\r
+                <outcome value='success'>\r
                     <set>\r
-                        <parameter name="tmp.relationship_length" value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\r
+                        <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\r
                     </set>\r
-                </block>\r
+                </outcome>\r
             </get-resource>\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r