New DGs required for deletion and bandwidth modification of a given cloud leased... 36/123936/1
authorHesam Rahimi <hesam.rahimi@huawei.com>
Tue, 7 Sep 2021 22:01:05 +0000 (18:01 -0400)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Tue, 7 Sep 2021 22:02:01 +0000 (18:02 -0400)
Issue-ID: SDNC-1594
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I0b6f2e32ddb103ca7ac053a80461980cfe10aab2

Former-commit-id: 926d912ec35ecd30f5f1c32ca91da2758b018223

platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json [new file with mode: 0644]
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json [new file with mode: 0644]
platform-logic/generic-resource-api/src/main/resources/graph.versions
platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml [new file with mode: 0644]
platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml [new file with mode: 0644]

index 6735690..a7a4249 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "52dc3c1b.333a2c",\r
+        "id": "b08c1973.bd8c78",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 186,\r
+        "x": 134,\r
         "y": 176.98507690429688,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "e697dcf2.06a8d8"\r
+                "d83ad958.6c1c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e697dcf2.06a8d8",\r
+        "id": "d83ad958.6c1c98",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 269.28570556640625,\r
+        "x": 217.28570556640625,\r
         "y": 238.22317504882812,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "97a4dbab.0d758"\r
+                "eca6c412.0a16f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97a4dbab.0d758",\r
+        "id": "eca6c412.0a16f8",\r
         "type": "method",\r
         "name": "method vnf-topology-operation",\r
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 261.42862701416016,\r
+        "x": 209.42862701416016,\r
         "y": 300.985071182251,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8972b0a6.363668"\r
+                "2cdcc77d.f46f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "274edea2.7a5922",\r
+        "id": "61311116.dbf858",\r
         "type": "comment",\r
         "name": "vnf-topology-operation",\r
         "info": "",\r
         "comments": "",\r
-        "x": 585.9162979125977,\r
+        "x": 533.9162979125977,\r
         "y": 20,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8972b0a6.363668",\r
+        "id": "2cdcc77d.f46f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 285.16676330566406,\r
+        "x": 233.16676330566406,\r
         "y": 630.6785974502563,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "133a6775.01f0f9",\r
-                "1733dfef.3f49f",\r
-                "705b4f8a.a36358"\r
+                "6710a9d8.fb4678",\r
+                "7a9dbdb8.f73dbc",\r
+                "5ab36ad7.13cd3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "133a6775.01f0f9",\r
+        "id": "6710a9d8.fb4678",\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.6667175292969,\r
+        "x": 525.6667175292969,\r
         "y": 785.8426303863525,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1733dfef.3f49f",\r
+        "id": "7a9dbdb8.f73dbc",\r
         "type": "switchNode",\r
         "name": "switch svc-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 580.5714340209961,\r
+        "x": 528.5714340209961,\r
         "y": 628.8898410797119,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "da76de1f.233328",\r
-                "cbb0455b.e639d8",\r
-                "79d670d9.ee597",\r
-                "c020b812.23b0c8",\r
-                "a7a77904.83da78",\r
-                "7f804bc8.db579c",\r
-                "55544e54.3dfca",\r
-                "b1e9d3b7.9a8aa8"\r
+                "412783d9.4fcccc",\r
+                "6a9050cd.10a51",\r
+                "b83d4104.597cb8",\r
+                "1e6c2684.62c321",\r
+                "6626bd7a.c146c4",\r
+                "7b0f6af8.40b7bc",\r
+                "53710100.c12778",\r
+                "57af1ec9.801de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da76de1f.233328",\r
+        "id": "412783d9.4fcccc",\r
         "type": "outcome",\r
         "name": "assign",\r
         "xml": "<outcome value='assign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 915.3809814453125,\r
+        "x": 863.3809814453125,\r
         "y": 456.5089511871338,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c4cc184d.0ea4c8"\r
+                "f9b5402f.69fe3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbb0455b.e639d8",\r
+        "id": "6a9050cd.10a51",\r
         "type": "outcome",\r
         "name": "unassign",\r
         "xml": "<outcome value='unassign'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.4287996292114,\r
+        "x": 925.4287996292114,\r
         "y": 1428.6997060775757,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "62d61b12.b4200c"\r
+                "79d300bc.c994d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c020b812.23b0c8",\r
+        "id": "1e6c2684.62c321",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 956.14306640625,\r
+        "x": 904.14306640625,\r
         "y": 2671.889892578125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ca1347e2.135d68"\r
+                "38f01e6e.33d09a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca1347e2.135d68",\r
+        "id": "38f01e6e.33d09a",\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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",\r
         "comments": "",\r
-        "x": 1179.33349609375,\r
+        "x": 1127.33349609375,\r
         "y": 2670.889892578125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "705b4f8a.a36358",\r
+        "id": "5ab36ad7.13cd3c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 686.4166870117188,\r
+        "x": 634.4166870117188,\r
         "y": 381.3661289215088,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9613c4e1.d7a7b8",\r
+        "id": "292bf52f.acc74a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1781.1906127929688,\r
+        "x": 1729.1906127929688,\r
         "y": 1360.7470703125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "62d61b12.b4200c",\r
+        "id": "79d300bc.c994d",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.1905822753906,\r
+        "x": 1291.1905822753906,\r
         "y": 1450.0805206298828,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "79d670d9.ee597",\r
+        "id": "b83d4104.597cb8",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 960.5238800048828,\r
+        "x": 908.5238800048828,\r
         "y": 965.080415725708,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "2d9f94b0.2d01c4"\r
+                "17da8571.b1fae3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e0f98d1.9dab98",\r
+        "id": "9b084f19.ecf398",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1763.0001525878906,\r
+        "x": 1711.0001525878906,\r
         "y": 863.9850616455078,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7a77904.83da78",\r
+        "id": "6626bd7a.c146c4",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 923.3333129882812,\r
+        "x": 871.3333129882812,\r
         "y": 626.6517143249512,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "40e38762.7c1048"\r
+                "ae63c627.07a6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f804bc8.db579c",\r
+        "id": "7b0f6af8.40b7bc",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 979.0002298355103,\r
+        "x": 927.0002298355103,\r
         "y": 1561.0713729858398,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "88f36a7a.1ee2b8"\r
+                "1775829a.de531d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55544e54.3dfca",\r
+        "id": "53710100.c12778",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 983.000244140625,\r
+        "x": 931.000244140625,\r
         "y": 1791.0714111328125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "68be57a6.5cb2c8"\r
+                "94f4a23a.42a478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad146a6b.6c96c",\r
+        "id": "53540352.f9f68c",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1165.0000839233398,\r
+        "x": 1113.0000839233398,\r
         "y": 682.0713911056519,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "6b8c0ccc.46f2dc",\r
-                "c1bcad35.fa989",\r
-                "7ab24aab.320da4",\r
-                "63108138.d2fb18",\r
-                "7c6d49f7.ca9348",\r
-                "4b606c40.f0bafc",\r
-                "12ca0f74.920081",\r
-                "36852303.31db6c"\r
+                "830ef633.1c44f",\r
+                "8133e2a6.f1e028",\r
+                "fab9d42f.05c56",\r
+                "f6de8c92.cb4738",\r
+                "abcf39b8.600f48",\r
+                "5d35e97c.a576b8",\r
+                "355cf522.240062",\r
+                "a13fab75.8b6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1bcad35.fa989",\r
+        "id": "8133e2a6.f1e028",\r
         "type": "outcome",\r
         "name": "ActivateSiteInstance",\r
         "xml": "<outcome value='ActivateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1425.4763259887695,\r
+        "x": 1373.4763259887695,\r
         "y": 503.5506420135498,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "70c5bbde.1c192c"\r
+                "d48ed7ad.9b4ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b8c0ccc.46f2dc",\r
+        "id": "830ef633.1c44f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1395.0476989746094,\r
+        "x": 1343.0476989746094,\r
         "y": 866.5953521728516,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8e0f98d1.9dab98"\r
+                "9b084f19.ecf398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40e38762.7c1048",\r
+        "id": "ae63c627.07a6c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1104.0000839233398,\r
+        "x": 1052.0000839233398,\r
         "y": 627.0713911056519,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ad146a6b.6c96c"\r
+                "53540352.f9f68c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70c5bbde.1c192c",\r
+        "id": "d48ed7ad.9b4ad8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1792.000129699707,\r
+        "x": 1740.000129699707,\r
         "y": 506.07142448425293,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5f642913.4416d8",\r
+        "id": "7d4fc284.339294",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1223.0001983642578,\r
+        "x": 1171.0001983642578,\r
         "y": 998.071382522583,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "14652ead.0b4c09",\r
-                "ff1c0dca.9a64e8",\r
-                "1113a32e.88f275",\r
-                "ffa9b2e3.752a98",\r
-                "35e1c8a9.0a4a7",\r
-                "6a9567cd.770ff",\r
-                "8df0deb7.6b34f",\r
-                "a64eaaf7.f8cc3"\r
+                "8d1fbb57.7b08b8",\r
+                "d0de6fd0.3c6ef",\r
+                "f08abf9c.96df58",\r
+                "663a6cd3.2064fc",\r
+                "90aad856.e82ec",\r
+                "526d564d.6c7ab8",\r
+                "5320aa0b.41e79c",\r
+                "4ef56ab7.3c11bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff1c0dca.9a64e8",\r
+        "id": "d0de6fd0.3c6ef",\r
         "type": "outcome",\r
         "name": "DeactivateSiteInstance",\r
         "xml": "<outcome value='DeactivateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1466.4763946533203,\r
+        "x": 1414.4763946533203,\r
         "y": 949.5506310462952,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "70ecad3d.c05e0c"\r
+                "2f9c149a.c3374c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14652ead.0b4c09",\r
+        "id": "8d1fbb57.7b08b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1418.0477294921875,\r
+        "x": 1366.0477294921875,\r
         "y": 1359.5953369140625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "9613c4e1.d7a7b8"\r
+                "292bf52f.acc74a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d9f94b0.2d01c4",\r
+        "id": "17da8571.b1fae3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1162.0001983642578,\r
+        "x": 1110.0001983642578,\r
         "y": 943.071382522583,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "5f642913.4416d8"\r
+                "7d4fc284.339294"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70ecad3d.c05e0c",\r
+        "id": "2f9c149a.c3374c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1836.0001983642578,\r
+        "x": 1784.0001983642578,\r
         "y": 947.0714135169983,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7fdb14.12230d",\r
+        "id": "3d9634f2.31397c",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1177.333625793457,\r
+        "x": 1125.333625793457,\r
         "y": 1647.6576824188232,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "5e28eb9d.e104a4",\r
-                "fd38b62c.0bb678",\r
-                "8e28a5cc.ac0e2",\r
-                "1476fb1f.a6cbf5",\r
-                "61a9db30.fa159c",\r
-                "d9d4b57b.7f4fb",\r
-                "aaada9e2.ef729",\r
-                "e2b0912f.196d98",\r
-                "41d994a4.c5eae4",\r
-                "d030a525.70e9c8",\r
-                "1fc4171d.33b849"\r
+                "45509d7.9afd7e4",\r
+                "bf292062.fb78e8",\r
+                "45a589e.cc88978",\r
+                "d9c9e5e2.12e7a",\r
+                "1cfc10cf.b254e7",\r
+                "a5526b64.cac2a8",\r
+                "c16e5fd0.4aa518",\r
+                "a5f0eabe.3a6b08",\r
+                "a8151edb.23d33",\r
+                "64592d67.04ac4c",\r
+                "f3be14bf.832d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd38b62c.0bb678",\r
+        "id": "bf292062.fb78e8",\r
         "type": "outcome",\r
         "name": "CreateSiteInstance",\r
         "xml": "<outcome value='CreateSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1438.81005859375,\r
+        "x": 1386.81005859375,\r
         "y": 1564.136962890625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "3d2b2583.58957a"\r
+                "f81999eb.513cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e28eb9d.e104a4",\r
+        "id": "45509d7.9afd7e4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1412.381103515625,\r
+        "x": 1360.381103515625,\r
         "y": 1971.1815185546875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "f1797bb7.25ea88"\r
+                "a6e272a7.82dea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88f36a7a.1ee2b8",\r
+        "id": "1775829a.de531d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1161.3337144851685,\r
+        "x": 1109.3337144851685,\r
         "y": 1558.6577405929565,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "a7fdb14.12230d"\r
+                "3d9634f2.31397c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d2b2583.58957a",\r
+        "id": "f81999eb.513cd",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1815.3337631225586,\r
+        "x": 1763.3337631225586,\r
         "y": 1562.6577215194702,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1797bb7.25ea88",\r
+        "id": "a6e272a7.82dea8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1552.6666793823242,\r
+        "x": 1500.6666793823242,\r
         "y": 1972.2379417419434,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6846bd6.20577",\r
+        "id": "82c12186.fb57c",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1218.000244140625,\r
+        "x": 1166.000244140625,\r
         "y": 2199.5714111328125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "fddd842c.27cd2",\r
-                "2010d2f3.2af6c6",\r
-                "2a1eda3b.cd6aa6",\r
-                "5b300353.bbdcb4",\r
-                "4c1ecd80.d07da4",\r
-                "55b8d324.626f94",\r
-                "c0084269.158748",\r
-                "165f464d.107712",\r
-                "b8d302e7.884668",\r
-                "783b5217.1ea664",\r
-                "845ca1dd.f3e83"\r
+                "c42a65f2.64dd58",\r
+                "88bc78af.c24ec8",\r
+                "f4835f3c.ebeff8",\r
+                "de1e7ee9.a17d5",\r
+                "2af016ea.40090a",\r
+                "1b9cba31.af7646",\r
+                "80f48140.69e83",\r
+                "4e6b5678.bbdd1",\r
+                "3b3f08be.c8d408",\r
+                "d01c50be.bd5f1",\r
+                "8b6f13e8.5b3d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2010d2f3.2af6c6",\r
+        "id": "88bc78af.c24ec8",\r
         "type": "outcome",\r
         "name": "DeleteSiteInstance",\r
         "xml": "<outcome value='DeleteSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1458.476463317871,\r
+        "x": 1406.476463317871,\r
         "y": 2145.050654888153,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8505b17f.bd79f8"\r
+                "cbc014db.1fae78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fddd842c.27cd2",\r
+        "id": "c42a65f2.64dd58",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1419.38134765625,\r
+        "x": 1367.38134765625,\r
         "y": 2550.095703125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "3f77d84b.50975"\r
+                "17f7c03b.44ae2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68be57a6.5cb2c8",\r
+        "id": "94f4a23a.42a478",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1157.000244140625,\r
+        "x": 1105.000244140625,\r
         "y": 2144.5714111328125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "f6846bd6.20577"\r
+                "82c12186.fb57c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8505b17f.bd79f8",\r
+        "id": "cbc014db.1fae78",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1831.0002670288086,\r
+        "x": 1779.0002670288086,\r
         "y": 2142.571406841278,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3f77d84b.50975",\r
+        "id": "17f7c03b.44ae2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1558.6668701171875,\r
+        "x": 1506.6668701171875,\r
         "y": 2543.818603515625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7ab24aab.320da4",\r
+        "id": "fab9d42f.05c56",\r
         "type": "outcome",\r
         "name": "ActivateSDWANDeviceInstance",\r
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1456.6667556762695,\r
+        "x": 1404.6667556762695,\r
         "y": 554.571455001831,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "1e393b2d.a12e0d"\r
+                "1e493cd.c332843"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e393b2d.a12e0d",\r
+        "id": "1e493cd.c332843",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1896.1904373168945,\r
+        "x": 1844.1904373168945,\r
         "y": 553.092206954956,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1113a32e.88f275",\r
+        "id": "f08abf9c.96df58",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANDeviceInstance",\r
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1507.666633605957,\r
+        "x": 1455.666633605957,\r
         "y": 997.571409702301,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "3cc29616.1d8c6a"\r
+                "280441a7.7fbcc6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3cc29616.1d8c6a",\r
+        "id": "280441a7.7fbcc6",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1964.190330505371,\r
+        "x": 1912.190330505371,\r
         "y": 997.0922451019287,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "919673a0.a6ef98",\r
+        "id": "ea4765a1.b2c99",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1893.666633605957,\r
+        "x": 1841.666633605957,\r
         "y": 593.5713939666748,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "63108138.d2fb18",\r
+        "id": "f6de8c92.cb4738",\r
         "type": "outcome",\r
         "name": "ActivateSDWANPortInstance",\r
         "xml": "<outcome value='ActivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1450.142951965332,\r
+        "x": 1398.142951965332,\r
         "y": 601.0506114959717,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "919673a0.a6ef98"\r
+                "ea4765a1.b2c99"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffa9b2e3.752a98",\r
+        "id": "663a6cd3.2064fc",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANPortInstance",\r
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1499.6666793823242,\r
+        "x": 1447.6666793823242,\r
         "y": 1035.904725074768,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "fe8e579c.e86c28"\r
+                "a0baa1f7.53a8d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe8e579c.e86c28",\r
+        "id": "a0baa1f7.53a8d8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1974.190330505371,\r
+        "x": 1922.190330505371,\r
         "y": 1052.4255270957947,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8e28a5cc.ac0e2",\r
+        "id": "45a589e.cc88978",\r
         "type": "outcome",\r
         "name": "CreateSDWANPortInstance",\r
         "xml": "<outcome value='CreateSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1488.6669540405273,\r
+        "x": 1436.6669540405273,\r
         "y": 1652.9047973155975,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "a44616aa.573d08"\r
+                "6778b9ee.08bfb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a44616aa.573d08",\r
+        "id": "6778b9ee.08bfb",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1945.190574645996,\r
+        "x": 1893.190574645996,\r
         "y": 1657.4255766868591,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2a1eda3b.cd6aa6",\r
+        "id": "f4835f3c.ebeff8",\r
         "type": "outcome",\r
         "name": "DeleteSDWANPortInstance",\r
         "xml": "<outcome value='DeleteSDWANPortInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1494.333480834961,\r
+        "x": 1442.333480834961,\r
         "y": 2255.9047994613647,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "5ed4255a.698824"\r
+                "6d4e9ab7.c9a55c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ed4255a.698824",\r
+        "id": "6d4e9ab7.c9a55c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1920.8572006225586,\r
+        "x": 1868.8572006225586,\r
         "y": 2255.425654888153,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b300353.bbdcb4",\r
+        "id": "de1e7ee9.a17d5",\r
         "type": "outcome",\r
         "name": "DeleteSDWANDeviceInstance",\r
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1503.0316314697266,\r
+        "x": 1451.0316314697266,\r
         "y": 2196.1027059555054,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c8b7ddea.37977"\r
+                "53c44f9f.dfe07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8b7ddea.37977",\r
+        "id": "53c44f9f.dfe07",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1935.5552368164062,\r
+        "x": 1883.5552368164062,\r
         "y": 2195.6234192848206,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1476fb1f.a6cbf5",\r
+        "id": "d9c9e5e2.12e7a",\r
         "type": "outcome",\r
         "name": "CreateSDWANDeviceInstance",\r
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1504.0313034057617,\r
+        "x": 1452.0313034057617,\r
         "y": 1609.1027607917786,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "61d26564.628b74"\r
+                "74d3246f.3fcfb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61d26564.628b74",\r
+        "id": "74d3246f.3fcfb4",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1960.5549697875977,\r
+        "x": 1908.5549697875977,\r
         "y": 1607.6235747337341,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c6d49f7.ca9348",\r
+        "id": "abcf39b8.600f48",\r
         "type": "outcome",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1459.2961730957031,\r
+        "x": 1407.2961730957031,\r
         "y": 641.8151397705078,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "eaa1b9cf.3f0ac8"\r
+                "8d92316e.8b3c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b606c40.f0bafc",\r
+        "id": "5d35e97c.a576b8",\r
         "type": "outcome",\r
         "name": "ActivateSDWANSiteInstance",\r
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1463.2961730957031,\r
+        "x": 1411.2961730957031,\r
         "y": 684.4815826416016,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "eaa1b9cf.3f0ac8"\r
+                "8d92316e.8b3c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eaa1b9cf.3f0ac8",\r
+        "id": "8d92316e.8b3c4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1734.2961654663086,\r
+        "x": 1682.2961654663086,\r
         "y": 662.4816343784332,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c19dccff.f727c"\r
+                "eb61034d.1bd878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c19dccff.f727c",\r
+        "id": "eb61034d.1bd878",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2112.296012878418,\r
+        "x": 2060.296012878418,\r
         "y": 659.8152935504913,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ed482171.811228",\r
+        "id": "810097d5.df9aa",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2160.3332138061523,\r
+        "x": 2108.3332138061523,\r
         "y": 1107.9380941390991,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "abf042f0.4f832",\r
+        "id": "bc96ce0d.cc2808",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1763.3333053588867,\r
+        "x": 1711.3333053588867,\r
         "y": 1109.6044387817383,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ed482171.811228"\r
+                "810097d5.df9aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a9567cd.770ff",\r
+        "id": "526d564d.6c7ab8",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANSiteInstance",\r
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1505.3332901000977,\r
+        "x": 1453.3332901000977,\r
         "y": 1131.6044034957886,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "abf042f0.4f832"\r
+                "bc96ce0d.cc2808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35e1c8a9.0a4a7",\r
+        "id": "90aad856.e82ec",\r
         "type": "outcome",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1499.3332595825195,\r
+        "x": 1447.3332595825195,\r
         "y": 1088.9379558563232,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "abf042f0.4f832"\r
+                "bc96ce0d.cc2808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a9db30.fa159c",\r
+        "id": "1cfc10cf.b254e7",\r
         "type": "outcome",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1484.8516340255737,\r
+        "x": 1432.8516340255737,\r
         "y": 1707.5928702354431,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "f07f3c83.550a58"\r
+                "aa5747c3.8ab7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9d4b57b.7f4fb",\r
+        "id": "a5526b64.cac2a8",\r
         "type": "outcome",\r
         "name": "CreateSDWANSiteInstance",\r
         "xml": "<outcome value='CreateSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1476.8516111373901,\r
+        "x": 1424.8516111373901,\r
         "y": 1749.2592587471008,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "f07f3c83.550a58"\r
+                "aa5747c3.8ab7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f07f3c83.550a58",\r
+        "id": "aa5747c3.8ab7e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1734.8516263961792,\r
+        "x": 1682.8516263961792,\r
         "y": 1727.2592940330505,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "7af344ec.760b9c"\r
+                "b5e70455.bc2a18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7af344ec.760b9c",\r
+        "id": "b5e70455.bc2a18",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2112.8514738082886,\r
+        "x": 2060.8514738082886,\r
         "y": 1724.5929532051086,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4c1ecd80.d07da4",\r
+        "id": "2af016ea.40090a",\r
         "type": "outcome",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1485.333396911621,\r
+        "x": 1433.333396911621,\r
         "y": 2302.938106060028,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c88802d9.f5598"\r
+                "65bab6f0.c060f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55b8d324.626f94",\r
+        "id": "1b9cba31.af7646",\r
         "type": "outcome",\r
         "name": "DeleteSDWANSiteInstance",\r
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1485.333396911621,\r
+        "x": 1433.333396911621,\r
         "y": 2343.6046710014343,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c88802d9.f5598"\r
+                "65bab6f0.c060f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c88802d9.f5598",\r
+        "id": "65bab6f0.c060f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1735.3333892822266,\r
+        "x": 1683.3333892822266,\r
         "y": 2322.6045298576355,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "5df064c8.71d95c"\r
+                "704495ca.7a513c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5df064c8.71d95c",\r
+        "id": "704495ca.7a513c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2113.333236694336,\r
+        "x": 2061.333236694336,\r
         "y": 2319.9381890296936,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2a64d3a1.fda20c",\r
+        "id": "92c41669.5f10d",\r
         "type": "set",\r
         "name": "set skip-mdsal-update to Y",\r
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",\r
         "comments": "",\r
-        "x": 2276.0318908691406,\r
+        "x": 2224.0318908691406,\r
         "y": 347.4920959472656,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa6afdab.2f8d4",\r
+        "id": "ce41a68.d7dd358",\r
         "type": "set",\r
         "name": "set ack-final to 'N'",\r
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",\r
         "comments": "",\r
-        "x": 2247.841583251953,\r
+        "x": 2195.841583251953,\r
         "y": 411.8401184082031,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf6e5057.8ccd2",\r
+        "id": "3fc1e46b.f23b24",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2039.3811340332031,\r
+        "x": 1987.3811340332031,\r
         "y": 350.4126281738281,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "2a64d3a1.fda20c",\r
-                "aa6afdab.2f8d4"\r
+                "92c41669.5f10d",\r
+                "ce41a68.d7dd358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e6c82fa.178adc",\r
+        "id": "7f50744b.207d6c",\r
         "type": "comment",\r
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2460.158966064453,\r
+        "x": 2408.158966064453,\r
         "y": 452.8094787597656,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca591061.3596c",\r
+        "id": "acee1d1.89fece",\r
         "type": "switchNode",\r
         "name": "so-response-url empty?",\r
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1145.2857971191406,\r
+        "x": 1093.2857971191406,\r
         "y": 197.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "11bfb1b.1f0f34e",\r
-                "6a6ad95.eb92228"\r
+                "2f35502b.b7354",\r
+                "3c60c54d.06499a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11bfb1b.1f0f34e",\r
+        "id": "2f35502b.b7354",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1370.2857971191406,\r
+        "x": 1318.2857971191406,\r
         "y": 153.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "bfe20f1a.ab3dc"\r
+                "22ca914a.d4e626"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a6ad95.eb92228",\r
+        "id": "3c60c54d.06499a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1360.2857971191406,\r
+        "x": 1308.2857971191406,\r
         "y": 245.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8865e5db.82cf58"\r
+                "43e90e5.f2739f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8865e5db.82cf58",\r
+        "id": "43e90e5.f2739f",\r
         "type": "switchNode",\r
         "name": "so-response-url = ignored URL?",\r
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1582.2857971191406,\r
+        "x": 1530.2857971191406,\r
         "y": 246.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "43d4d039.c252a8",\r
-                "ef513436.7e0d"\r
+                "abb99daa.0dec3",\r
+                "36aee43b.cf39c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfe20f1a.ab3dc",\r
+        "id": "22ca914a.d4e626",\r
         "type": "call",\r
         "name": "call vnf-topology-operation-assign-sync",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046.2857971191406,\r
+        "x": 1994.2857971191406,\r
         "y": 154.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "43d4d039.c252a8",\r
+        "id": "abb99daa.0dec3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1822.2857971191406,\r
+        "x": 1770.2857971191406,\r
         "y": 245.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "bfe20f1a.ab3dc"\r
+                "22ca914a.d4e626"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef513436.7e0d",\r
+        "id": "36aee43b.cf39c4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1830.2857971191406,\r
+        "x": 1778.2857971191406,\r
         "y": 346.28570556640625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "cf6e5057.8ccd2"\r
+                "3fc1e46b.f23b24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "923cd314.7d8bd",\r
+        "id": "4f5b2bd1.07c3ac",\r
         "type": "execute",\r
         "name": "execute getProperties",\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": 1158.6622619628906,\r
+        "x": 1106.6622619628906,\r
         "y": 87.54547119140625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c4cc184d.0ea4c8",\r
+        "id": "f9b5402f.69fe3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967.7533264160156,\r
+        "x": 915.7533264160156,\r
         "y": 85.727294921875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ca591061.3596c",\r
-                "923cd314.7d8bd"\r
+                "acee1d1.89fece",\r
+                "4f5b2bd1.07c3ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaada9e2.ef729",\r
+        "id": "c16e5fd0.4aa518",\r
         "type": "outcome",\r
         "name": "CreateSOTNUnderlayInstance",\r
         "xml": "<outcome value='CreateSOTNUnderlayInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1484.6665983200073,\r
+        "x": 1432.6665983200073,\r
         "y": 1786.999900341034,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8c22093f.9d959"\r
+                "1e078eaa.7eade9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c22093f.9d959",\r
+        "id": "1e078eaa.7eade9",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-create",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1941.190218925476,\r
+        "x": 1889.190218925476,\r
         "y": 1791.5206797122955,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "12ca0f74.920081",\r
+        "id": "355cf522.240062",\r
         "type": "outcome",\r
         "name": "ActivateSOTNUnderlayInstance",\r
         "xml": "<outcome value='ActivateSOTNUnderlayInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1475.9999694824219,\r
+        "x": 1423.9999694824219,\r
         "y": 723.3332703113556,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "e49875ef.c52be8"\r
+                "b9aefa7c.a46e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e49875ef.c52be8",\r
+        "id": "b9aefa7c.a46e1",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1935.8569641113281,\r
+        "x": 1883.8569641113281,\r
         "y": 717.8540802001953,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8df0deb7.6b34f",\r
+        "id": "5320aa0b.41e79c",\r
         "type": "outcome",\r
         "name": "DeactivateSOTNUnderlayInstance",\r
         "xml": "<outcome value='DeactivateSOTNUnderlayInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1507.6666564941406,\r
+        "x": 1455.6666564941406,\r
         "y": 1167.6665802001953,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "b1ed3246.76087"\r
+                "d655c6c6.a32328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1ed3246.76087",\r
+        "id": "d655c6c6.a32328",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1975.8569641113281,\r
+        "x": 1923.8569641113281,\r
         "y": 1170.520523071289,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c0084269.158748",\r
+        "id": "80f48140.69e83",\r
         "type": "outcome",\r
         "name": "DeleteSOTNUnderlayInstance",\r
         "xml": "<outcome value='DeleteSOTNUnderlayInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1493.6666717529297,\r
+        "x": 1441.6666717529297,\r
         "y": 2377.3333563804626,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "686e0e67.7a751"\r
+                "468ffee1.2855f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "686e0e67.7a751",\r
+        "id": "468ffee1.2855f8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1931.8571014404297,\r
+        "x": 1879.8571014404297,\r
         "y": 2373.52073431015,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e2b0912f.196d98",\r
+        "id": "a5f0eabe.3a6b08",\r
         "type": "outcome",\r
         "name": "CreateAccessConnectivityInstance",\r
         "xml": "<outcome value='CreateAccessConnectivityInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1498.5,\r
+        "x": 1446.5,\r
         "y": 1490.75,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "bf116022.c4859"\r
+                "d2142bbd.6e0b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf116022.c4859",\r
+        "id": "d2142bbd.6e0b5",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1784.432861328125,\r
+        "x": 1732.432861328125,\r
         "y": 1488.033447265625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c1cf5568.c6dfa8"\r
+                "cf0e0faa.cd3c68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1cf5568.c6dfa8",\r
+        "id": "cf0e0faa.cd3c68",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2021.599365234375,\r
+        "x": 1969.599365234375,\r
         "y": 1482.033447265625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "50f3e3de.c203d4"\r
+                "1db158f1.6a05cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50f3e3de.c203d4",\r
+        "id": "1db158f1.6a05cf",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2215.599365234375,\r
+        "x": 2163.599365234375,\r
         "y": 1483.03369140625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "cc91a75d.80fb6"\r
+                "7fceff62.e4939"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41d994a4.c5eae4",\r
+        "id": "a8151edb.23d33",\r
         "type": "outcome",\r
         "name": "CreateInternetProfileInstance",\r
         "xml": "<outcome value='CreateInternetProfileInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1476.283203125,\r
+        "x": 1424.283203125,\r
         "y": 1527.616455078125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "dd99ca43.a58fc8"\r
+                "64727697.d8b17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd99ca43.a58fc8",\r
+        "id": "64727697.d8b17",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1761.439453125,\r
+        "x": 1709.439453125,\r
         "y": 1526.60595703125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c974314c.cea318"\r
+                "269c07cc.f190b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c974314c.cea318",\r
+        "id": "269c07cc.f190b8",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2014.6058349609375,\r
+        "x": 1962.6058349609375,\r
         "y": 1523.60595703125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "4b8503a0.e71674"\r
+                "87b9bafd.1c9e9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b8503a0.e71674",\r
+        "id": "87b9bafd.1c9e9",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2210.605712890625,\r
+        "x": 2158.605712890625,\r
         "y": 1539.606201171875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "67fb1068.fd41f8"\r
+                "8a5f329e.a0141"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67fb1068.fd41f8",\r
+        "id": "8a5f329e.a0141",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer value",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2433.606201171875,\r
+        "x": 2381.606201171875,\r
         "y": 1549.6064453125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "7f2dad35.040724"\r
+                "34201735.16c088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc91a75d.80fb6",\r
+        "id": "7fceff62.e4939",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer value",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2447.599853515625,\r
+        "x": 2395.599853515625,\r
         "y": 1483.033935546875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "9a690577.7147a8",\r
-                "5e1152e7.2696dc"\r
+                "a4a78bd9.b60428",\r
+                "176d5dff.506062"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a690577.7147a8",\r
+        "id": "a4a78bd9.b60428",\r
         "type": "outcomeTrue",\r
         "name": "HUAWEI",\r
         "xml": "<outcome value='HUAWEI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2679.433349609375,\r
+        "x": 2627.433349609375,\r
         "y": 1485.03369140625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ae3a7d63.ff15f8"\r
+                "18e58db6.0dbd7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e1152e7.2696dc",\r
+        "id": "176d5dff.506062",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2673.833251953125,\r
+        "x": 2621.833251953125,\r
         "y": 1516.75,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "d48ba9fe.9916a8"\r
+                "8e7baf46.5b38d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f2dad35.040724",\r
+        "id": "34201735.16c088",\r
         "type": "outcomeTrue",\r
         "name": "HUAWEI",\r
         "xml": "<outcome value='HUAWEI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2661.439453125,\r
+        "x": 2609.439453125,\r
         "y": 1579.606201171875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ea39a012.0f4f1"\r
+                "7b62883e.cdba1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae3a7d63.ff15f8",\r
+        "id": "18e58db6.0dbd7a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-create-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3176.2769165039062,\r
+        "x": 3124.2769165039062,\r
         "y": 1485.044189453125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d48ba9fe.9916a8",\r
+        "id": "8e7baf46.5b38d",\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-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`\" />",\r
         "comments": "",\r
-        "x": 2922.166259765625,\r
+        "x": 2870.166259765625,\r
         "y": 1528.4166259765625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea39a012.0f4f1",\r
+        "id": "7b62883e.cdba1",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-create-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3162.283447265625,\r
+        "x": 3110.283447265625,\r
         "y": 1581.616943359375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "165f464d.107712",\r
+        "id": "4e6b5678.bbdd1",\r
         "type": "outcome",\r
         "name": "DeleteAccessConnectivityInstance",\r
         "xml": "<outcome value='DeleteAccessConnectivityInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1509.75,\r
+        "x": 1457.75,\r
         "y": 2053.75,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "3524df44.6fd078"\r
+                "f1caeecd.25957"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3524df44.6fd078",\r
+        "id": "f1caeecd.25957",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1822.5732421875,\r
+        "x": 1770.5732421875,\r
         "y": 2044.73974609375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "85c9002a.349e6"\r
+                "5e96574e.86f738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85c9002a.349e6",\r
+        "id": "5e96574e.86f738",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2093.7393798828125,\r
+        "x": 2041.7393798828125,\r
         "y": 2038.73974609375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "b32cabaf.bacda8"\r
+                "c452d879.26ff28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b32cabaf.bacda8",\r
+        "id": "c452d879.26ff28",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2293.739501953125,\r
+        "x": 2241.739501953125,\r
         "y": 2038.7396240234375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "841727b2.fc43c8"\r
+                "bd20cc20.6e10d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8d302e7.884668",\r
+        "id": "3b3f08be.c8d408",\r
         "type": "outcome",\r
         "name": "DeleteInternetProfileInstance",\r
         "xml": "<outcome value='DeleteInternetProfileInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1491.316650390625,\r
+        "x": 1439.316650390625,\r
         "y": 2093.800048828125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "3f16f881.9bf11"\r
+                "b43faceb.f3917"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f16f881.9bf11",\r
+        "id": "b43faceb.f3917",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1768.6500244140625,\r
+        "x": 1716.6500244140625,\r
         "y": 2105.5167236328125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "12fa6cf1.712bb3"\r
+                "a4639531.47b2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12fa6cf1.712bb3",\r
+        "id": "a4639531.47b2f",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1996.8163528442383,\r
+        "x": 1944.8163528442383,\r
         "y": 2094.516764640808,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "93b663df.15b9d8"\r
+                "44d49ff5.a0c208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93b663df.15b9d8",\r
+        "id": "44d49ff5.a0c208",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2186.816230773926,\r
+        "x": 2134.816230773926,\r
         "y": 2094.517008781433,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "a3704e9.eb7593"\r
+                "9d7d02f.677b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3704e9.eb7593",\r
+        "id": "9d7d02f.677b2",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer value",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2400.816719055176,\r
+        "x": 2348.816719055176,\r
         "y": 2090.517252922058,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "b25d7a6c.2d20b8"\r
+                "db0191ad.110598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "841727b2.fc43c8",\r
+        "id": "bd20cc20.6e10d",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer value",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2552.7398986816406,\r
+        "x": 2500.7398986816406,\r
         "y": 2031.739761352539,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ce1c777.780d788"\r
+                "a725d07a.a0193"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce1c777.780d788",\r
+        "id": "a725d07a.a0193",\r
         "type": "outcomeTrue",\r
         "name": "HUAWEI",\r
         "xml": "<outcome value='HUAWEI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2755.5732421875,\r
+        "x": 2703.5732421875,\r
         "y": 2040.7396240234375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "74540f1f.a1ddd8"\r
+                "4175e3e7.a9b7ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b25d7a6c.2d20b8",\r
+        "id": "db0191ad.110598",\r
         "type": "outcomeTrue",\r
         "name": "HUAWEI",\r
         "xml": "<outcome value='HUAWEI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2588.6497802734375,\r
+        "x": 2536.6497802734375,\r
         "y": 2086.5169677734375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "5eff96f4.fc3fe8"\r
+                "f6b877e8.c332b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5eff96f4.fc3fe8",\r
+        "id": "f6b877e8.c332b8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-delete-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2931.493896484375,\r
+        "x": 2879.493896484375,\r
         "y": 2146.527587890625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "74540f1f.a1ddd8",\r
+        "id": "4175e3e7.a9b7ac",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-delete-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3196.750732421875,\r
+        "x": 3144.750732421875,\r
         "y": 2089.7506103515625,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b1e9d3b7.9a8aa8",\r
+        "id": "57af1ec9.801de",\r
         "type": "outcome",\r
         "name": "update",\r
         "xml": "<outcome value='update'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 974.499942779541,\r
+        "x": 922.499942779541,\r
         "y": 2514.00008392334,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "4a660084.f9bd28"\r
+                "15763754.a08db9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a660084.f9bd28",\r
+        "id": "15763754.a08db9",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1177.4999732971191,\r
+        "x": 1125.4999732971191,\r
         "y": 2607.50008392334,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "b5226790.62d05",\r
-                "8ab2dfbb.a1916",\r
-                "3c8354f5.d5e214"\r
+                "718d5eb4.13f9c",\r
+                "e202c84d.63b5e",\r
+                "785391cc.908aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5226790.62d05",\r
+        "id": "718d5eb4.13f9c",\r
         "type": "outcome",\r
         "name": "ChangeInternetProfileInstance",\r
         "xml": "<outcome value='ChangeInternetProfileInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1450.499912261963,\r
+        "x": 1398.499912261963,\r
         "y": 2604.00008392334,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "b5959f12.cf2018"\r
+                "128a4eef.95f9c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5959f12.cf2018",\r
+        "id": "128a4eef.95f9c9",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1774.6561279296875,\r
+        "x": 1722.6561279296875,\r
         "y": 2602.98974609375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "c791de21.3161a"\r
+                "3aee2d11.4be5aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c791de21.3161a",\r
+        "id": "3aee2d11.4be5aa",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer",\r
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2035.822509765625,\r
+        "x": 1983.822509765625,\r
         "y": 2600.98974609375,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "9a634162.bb58a"\r
+                "b0c1a7c8.a9625"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a634162.bb58a",\r
+        "id": "b0c1a7c8.a9625",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2223.822395324707,\r
+        "x": 2171.822395324707,\r
         "y": 2602.989908218384,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "a31b2229.3b0b6"\r
+                "6904d45.72ac0ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a31b2229.3b0b6",\r
+        "id": "6904d45.72ac0ac",\r
         "type": "switchNode",\r
         "name": "switch:manufacturer value",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2434.8230361938477,\r
+        "x": 2382.8230361938477,\r
         "y": 2602.9902334213257,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "db546338.55a6a"\r
+                "5d910c1a.f9d114"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db546338.55a6a",\r
+        "id": "5d910c1a.f9d114",\r
         "type": "outcomeTrue",\r
         "name": "HUAWEI",\r
         "xml": "<outcome value='HUAWEI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2686.6562690734863,\r
+        "x": 2634.6562690734863,\r
         "y": 2528.989896774292,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "f54d61cc.01d07"\r
+                "f4570bab.e4ff9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f54d61cc.01d07",\r
+        "id": "f4570bab.e4ff9",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-change-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3150.5008239746094,\r
+        "x": 3098.5008239746094,\r
         "y": 2530.000228881836,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "36852303.31db6c",\r
+        "id": "a13fab75.8b6a8",\r
         "type": "outcome",\r
         "name": "ActivateTransportSliceInstance",\r
         "xml": "<outcome value='ActivateTransportSliceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1472,\r
+        "x": 1420,\r
         "y": 787,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "2ec0ae18.6972ba"\r
+                "d74087cd.f2dfe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ec0ae18.6972ba",\r
+        "id": "d74087cd.f2dfe8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1931.8569946289062,\r
+        "x": 1879.8569946289062,\r
         "y": 781.5208098888397,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "783b5217.1ea664",\r
+        "id": "d01c50be.bd5f1",\r
         "type": "outcome",\r
         "name": "DeleteTransportSliceInstance",\r
         "xml": "<outcome value='DeleteTransportSliceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1488,\r
+        "x": 1436,\r
         "y": 2445,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "4d5e1a9e.f28edc"\r
+                "d69aff69.a21738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d5e1a9e.f28edc",\r
+        "id": "d69aff69.a21738",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1926.1904296875,\r
+        "x": 1874.1904296875,\r
         "y": 2441.1873779296875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d030a525.70e9c8",\r
+        "id": "64592d67.04ac4c",\r
         "type": "outcome",\r
         "name": "AllocateTransportSliceInstance",\r
         "xml": "<outcome value='AllocateTransportSliceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1481,\r
+        "x": 1429,\r
         "y": 1855,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "d2ac7ea8.556cf8"\r
+                "264be732.34667"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2ac7ea8.556cf8",\r
+        "id": "264be732.34667",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-allocate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1933.523681640625,\r
+        "x": 1881.523681640625,\r
         "y": 1849.520751953125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a64eaaf7.f8cc3",\r
+        "id": "4ef56ab7.3c11bc",\r
         "type": "outcome",\r
         "name": "DeactivateTransportSliceInstance",\r
         "xml": "<outcome value='DeactivateTransportSliceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1506,\r
+        "x": 1454,\r
         "y": 1240,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "ace1a0de.86c7b"\r
+                "cdd18c15.f8004"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ace1a0de.86c7b",\r
+        "id": "cdd18c15.f8004",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-deactivate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1974.1903076171875,\r
+        "x": 1922.1903076171875,\r
         "y": 1242.8539428710938,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8ab2dfbb.a1916",\r
+        "id": "e202c84d.63b5e",\r
         "type": "outcome",\r
         "name": "ModifyTransportSliceInstance",\r
         "xml": "<outcome value='DeleteTransportSliceInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1445,\r
+        "x": 1393,\r
         "y": 2661,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "8e513e9b.02f858"\r
+                "ff1a01d3.8d56b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e513e9b.02f858",\r
+        "id": "ff1a01d3.8d56b8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-modify",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1883.1904296875,\r
+        "x": 1831.1904296875,\r
         "y": 2657.1873779296875,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1fc4171d.33b849",\r
+        "id": "f3be14bf.832d98",\r
         "type": "outcome",\r
         "name": "CreateCloudLeasedLineInstance",\r
         "xml": "<outcome value='CreateCloudLeasedLineInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1480,\r
+        "x": 1428,\r
         "y": 1911,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "fcc35da5.66b088"\r
+                "1ea9d4bd.5ee1eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcc35da5.66b088",\r
+        "id": "1ea9d4bd.5ee1eb",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1932.523681640625,\r
+        "x": 1880.523681640625,\r
         "y": 1905.520751953125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "845ca1dd.f3e83",\r
+        "id": "8b6f13e8.5b3d98",\r
         "type": "outcome",\r
         "name": "DeleteCloudLeasedLineInstance",\r
         "xml": "<outcome value='DeleteCloudLeasedLineInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1497,\r
+        "x": 1445,\r
         "y": 2493,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "d1528432.c809d"\r
+                "8f2cb83.e7aac48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1528432.c809d",\r
+        "id": "8f2cb83.e7aac48",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1940.523681640625,\r
+        "x": 1888.523681640625,\r
         "y": 2493.520751953125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3c8354f5.d5e214",\r
+        "id": "785391cc.908aa",\r
         "type": "outcome",\r
         "name": "ModifyCloudLeasedLineInstance",\r
         "xml": "<outcome value='ModifyCloudLeasedLineInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1447,\r
+        "x": 1395,\r
         "y": 2716,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             [\r
-                "47ca6bac.c33744"\r
+                "9cf1ed84.3cb2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47ca6bac.c33744",\r
+        "id": "9cf1ed84.3cb2d",\r
         "type": "call",\r
-        "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete' mode='sync' >\n",\r
+        "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-modify' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1890.523681640625,\r
+        "x": 1838.523681640625,\r
         "y": 2716.520751953125,\r
-        "z": "de6608eb.7dee68",\r
+        "z": "2274856e.775caa",\r
         "wires": [\r
             []\r
         ]\r
index 376401b..7eb6448 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "917062ba.849008",\r
+        "id": "66573054.d6959",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 218,\r
-        "y": 53,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 230,\r
+        "y": 62,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "1c89f912.b4a1a7"\r
+                "88fd1149.f833f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c89f912.b4a1a7",\r
+        "id": "88fd1149.f833f",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 502.2856903076172,\r
-        "y": 114.23810863494873,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 514.2856903076172,\r
+        "y": 123.23810863494873,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "79c37e31.b46698"\r
+                "4c164ab.c48bfb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79c37e31.b46698",\r
+        "id": "4c164ab.c48bfb4",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 418.4285888671875,\r
-        "y": 192.00003051757812,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 430.4285888671875,\r
+        "y": 201.00003051757812,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "e40aa944.361218"\r
+                "e2c1e393.f72a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e40aa944.361218",\r
+        "id": "e2c1e393.f72a2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 152.238037109375,\r
-        "y": 695.6666870117188,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 164.238037109375,\r
+        "y": 704.6666870117188,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "91449a53.15abc8",\r
-                "52206559.265cbc",\r
-                "dc5388ea.7452c",\r
-                "cd1cf50b.3447d",\r
-                "36cc6c32.a7a5bc",\r
-                "ef8123f7.a43b88",\r
-                "349f069b.2d098a"\r
+                "35872244.0dadfe",\r
+                "76353aba.1a1834",\r
+                "1a3db60a.42601a",\r
+                "cde65043.1c4f8",\r
+                "5f4f339e.018654",\r
+                "6f21b0a4.c1ba8",\r
+                "19956ea.f245091"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91449a53.15abc8",\r
+        "id": "35872244.0dadfe",\r
         "type": "set",\r
         "name": "set query_param",\r
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",\r
         "comments": "",\r
-        "x": 425,\r
-        "y": 650,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 437,\r
+        "y": 659,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52206559.265cbc",\r
+        "id": "76353aba.1a1834",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 646,\r
-        "y": 718,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 658,\r
+        "y": 727,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc5388ea.7452c",\r
+        "id": "1a3db60a.42601a",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 436,\r
-        "y": 764,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 448,\r
+        "y": 773,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "349f069b.2d098a",\r
+        "id": "19956ea.f245091",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 629,\r
-        "y": 828,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 641,\r
+        "y": 837,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cd1cf50b.3447d",\r
+        "id": "cde65043.1c4f8",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 456,\r
-        "y": 984,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 468,\r
+        "y": 993,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "4719cb7a.a9766c"\r
+                "53111f1b.5dbab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4719cb7a.a9766c",\r
+        "id": "53111f1b.5dbab",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 725,\r
-        "y": 984,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 737,\r
+        "y": 993,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ffc8e265.c8aca8",\r
-                "13f1d395.eb898c",\r
-                "b91b98db.dabfa",\r
-                "66797943.9e353",\r
-                "c2e19c98.abbc4",\r
-                "11040b46.8e035d",\r
-                "130409d7.ba1cfe",\r
-                "3e17d72f.d352d",\r
-                "1ea79a81.da9f1d",\r
-                "f0ca8ca2.d5c31"\r
+                "78857b79.cfe234",\r
+                "b3432980.49ee6",\r
+                "233e999f.144d9e",\r
+                "7a85fbed.abf844",\r
+                "715b7a53.d039d4",\r
+                "13d7f319.f10ffd",\r
+                "fe43d4e7.2e266",\r
+                "9673bbc9.e232d8",\r
+                "8c1ff0ec.d0238",\r
+                "84f3d24d.36c17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffc8e265.c8aca8",\r
+        "id": "78857b79.cfe234",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding $otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1618,\r
-        "y": 798,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1630,\r
+        "y": 807,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "13f1d395.eb898c",\r
+        "id": "b3432980.49ee6",\r
         "type": "switchNode",\r
         "name": "switch dstPort == NULL",\r
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1332,\r
-        "y": 888,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1344,\r
+        "y": 897,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "467187d6.5cb93",\r
-                "dac264a6.6c03c8"\r
+                "fb6a4667.5dee4",\r
+                "8968ad13.112c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "467187d6.5cb93",\r
+        "id": "fb6a4667.5dee4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1698,\r
-        "y": 849,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1710,\r
+        "y": 858,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6cf7a6e6.d655a8"\r
+                "38cd80d0.a81b08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dac264a6.6c03c8",\r
+        "id": "8968ad13.112c48",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1699,\r
-        "y": 895,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1711,\r
+        "y": 904,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5ca74bf6.9d33ac"\r
+                "12ac055c.676cf3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cf7a6e6.d655a8",\r
+        "id": "38cd80d0.a81b08",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",\r
         "comments": "",\r
-        "x": 1912,\r
-        "y": 848,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1924,\r
+        "y": 857,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ca74bf6.9d33ac",\r
+        "id": "12ac055c.676cf3",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",\r
         "comments": "",\r
-        "x": 1910,\r
-        "y": 893,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1922,\r
+        "y": 902,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b91b98db.dabfa",\r
+        "id": "233e999f.144d9e",\r
         "type": "set",\r
         "name": "set srcdstpnf-name",\r
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1508,\r
-        "y": 962,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1520,\r
+        "y": 971,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66797943.9e353",\r
+        "id": "7a85fbed.abf844",\r
         "type": "get-resource",\r
         "name": "get-resource tmp.srcdstpnf-name",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1552,\r
-        "y": 1010,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1564,\r
+        "y": 1019,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2fed2218.d10326",\r
-                "6a522d09.043e1c",\r
-                "4f95b3dd.ef9534"\r
+                "85cf2b2f.efe2d8",\r
+                "40c18c0.1c43574",\r
+                "e3b12e57.7afb78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fed2218.d10326",\r
+        "id": "85cf2b2f.efe2d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1764.5,\r
-        "y": 957,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1776.5,\r
+        "y": 966,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "66f51b5e.6158fc"\r
+                "7b23fddb.009994"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a522d09.043e1c",\r
+        "id": "40c18c0.1c43574",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1776.5,\r
-        "y": 1007,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1788.5,\r
+        "y": 1016,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "8e681ebe.696e48"\r
+                "317c3552.8ea652"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f95b3dd.ef9534",\r
+        "id": "e3b12e57.7afb78",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1767.5,\r
-        "y": 1062,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1779.5,\r
+        "y": 1071,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6977d582.14091c"\r
+                "c0e357e5.8168d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6977d582.14091c",\r
+        "id": "c0e357e5.8168d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1912.5,\r
-        "y": 1061,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1924.5,\r
+        "y": 1070,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e681ebe.696e48",\r
+        "id": "317c3552.8ea652",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1923.5,\r
-        "y": 1004,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1935.5,\r
+        "y": 1013,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66f51b5e.6158fc",\r
+        "id": "7b23fddb.009994",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1889.8824462890625,\r
-        "y": 950.6556701660156,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1901.8824462890625,\r
+        "y": 959.6556701660156,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "3a1d3f10.5d9028"\r
+                "f3d54fb4.5c0a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a1d3f10.5d9028",\r
+        "id": "f3d54fb4.5c0a1",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2051,\r
-        "y": 965,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2063,\r
+        "y": 974,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "c1512230.2580e"\r
+                "763118b6.61e2b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1512230.2580e",\r
+        "id": "763118b6.61e2b8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2246,\r
-        "y": 965,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2258,\r
+        "y": 974,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b1b8c338.420ea"\r
+                "45a9ec7c.a92c4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd7930d3.be8638",\r
+        "id": "6fd0244b.f38ce4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2626,\r
-        "y": 961,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2638,\r
+        "y": 970,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ac1612ad.b61828",\r
-                "27939c6a.4866bc"\r
+                "e527c2f.df2fcc",\r
+                "56d60802.89ee28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27939c6a.4866bc",\r
+        "id": "56d60802.89ee28",\r
         "type": "execute",\r
         "name": "get 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 = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2834,\r
-        "y": 968,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2846,\r
+        "y": 977,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b52d7285.57757",\r
-                "3657321a.c3ba86",\r
-                "c044af78.310578"\r
+                "b854345d.faf84",\r
+                "437ea2b.b00f35c",\r
+                "fed3318a.a11e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac1612ad.b61828",\r
+        "id": "e527c2f.df2fcc",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 2864,\r
-        "y": 916,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2876,\r
+        "y": 925,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b52d7285.57757",\r
+        "id": "b854345d.faf84",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3044,\r
-        "y": 959,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3056,\r
+        "y": 968,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "cbaaba15.349bc8"\r
+                "918d39ea.cf7f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3657321a.c3ba86",\r
+        "id": "437ea2b.b00f35c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3036,\r
-        "y": 1014,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3048,\r
+        "y": 1023,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "f52e6392.eb1be8"\r
+                "1afabba1.4179cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c044af78.310578",\r
+        "id": "fed3318a.a11e3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3041,\r
-        "y": 1071,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3053,\r
+        "y": 1080,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7b6a4d1e.bd1e74"\r
+                "e095e0e5.375ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b6a4d1e.bd1e74",\r
+        "id": "e095e0e5.375ba",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3193,\r
-        "y": 1072,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3205,\r
+        "y": 1081,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f52e6392.eb1be8",\r
+        "id": "1afabba1.4179cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3204,\r
-        "y": 1017,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3216,\r
+        "y": 1026,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbaaba15.349bc8",\r
+        "id": "918d39ea.cf7f2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3188.38232421875,\r
-        "y": 956.6556701660156,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3200.38232421875,\r
+        "y": 965.6556701660156,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "37241585.bf56ba"\r
+                "47a021ef.066c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1b8c338.420ea",\r
+        "id": "45a9ec7c.a92c4c",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2449,\r
-        "y": 969,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2461,\r
+        "y": 978,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "fd7930d3.be8638"\r
+                "6fd0244b.f38ce4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37241585.bf56ba",\r
+        "id": "47a021ef.066c88",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 3403,\r
-        "y": 953,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3415,\r
+        "y": 962,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5bdba13b.1ae3d",\r
+        "id": "d75cf545.437ae8",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1562,\r
-        "y": 2859,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1574,\r
+        "y": 2868,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2982a228.f40e1e"\r
+                "871b9e34.870768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e79aedfa.249",\r
+        "id": "fd805b4d.1b0548",\r
         "type": "save",\r
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2134.5,\r
-        "y": 2963,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2146.5,\r
+        "y": 2972,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2982a228.f40e1e",\r
+        "id": "871b9e34.870768",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1868,\r
-        "y": 2858,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1880,\r
+        "y": 2867,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "3d256a26.ef6a26"\r
+                "ee92c990.60c9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d256a26.ef6a26",\r
+        "id": "ee92c990.60c9f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2077.5,\r
-        "y": 2858.25390625,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2089.5,\r
+        "y": 2867.25390625,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7e7c0247.8ba9f4",\r
+        "id": "702e0066.542168",\r
         "type": "switchNode",\r
         "name": "switch otnidx == 0",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471,\r
-        "y": 2976,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1483,\r
+        "y": 2985,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2d5f380b.a9d4d8",\r
-                "4f3979ad.4a4e48"\r
+                "bb13d1a8.37e5",\r
+                "a19ebb79.79b868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d5f380b.a9d4d8",\r
+        "id": "bb13d1a8.37e5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1654,\r
-        "y": 2976,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1666,\r
+        "y": 2985,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ffef74e0.d4b7c"\r
+                "62ae9cfb.3879bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f3979ad.4a4e48",\r
+        "id": "a19ebb79.79b868",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1479,\r
-        "y": 3123,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1491,\r
+        "y": 3132,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "a4296e1e.d8981"\r
+                "db504ec2.be40a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a4f2a93.c11d2d",\r
+        "id": "d2ac9909.c7d83",\r
         "type": "switchNode",\r
         "name": "switch otnidx == last",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1820,\r
-        "y": 3204,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1832,\r
+        "y": 3213,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b3a20bdf.7738d8",\r
-                "b291bad0.bdbf18"\r
+                "f6ac8945.06d298",\r
+                "d0d3740b.46215"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3a20bdf.7738d8",\r
+        "id": "f6ac8945.06d298",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1996,\r
-        "y": 3205,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2008,\r
+        "y": 3214,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6075d4e4.60740c"\r
+                "84c92d78.7984b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c49019c0.e84e08",\r
+        "id": "b93d4ed1.4609d8",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 2059,\r
-        "y": 3020,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2071,\r
+        "y": 3029,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffef74e0.d4b7c",\r
+        "id": "62ae9cfb.3879bc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1795,\r
-        "y": 2966,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1807,\r
+        "y": 2975,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "e79aedfa.249",\r
-                "c49019c0.e84e08",\r
-                "733089d7.e1acb"\r
+                "fd805b4d.1b0548",\r
+                "b93d4ed1.4609d8",\r
+                "ea374103.b6422"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a6ce6ad.7fc7a",\r
+        "id": "11cd0588.41272a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2701,\r
-        "y": 3155,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2713,\r
+        "y": 3164,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "424b4783.7d233"\r
+                "5ba25870.61d0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc1f97b8.8c6ce8",\r
+        "id": "302e8991.9483b6",\r
         "type": "set",\r
         "name": "set",\r
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",\r
         "comments": "",\r
-        "x": 1768,\r
-        "y": 3155,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1780,\r
+        "y": 3164,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4296e1e.d8981",\r
+        "id": "db504ec2.be40a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1603,\r
-        "y": 3130,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1615,\r
+        "y": 3139,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "cc1f97b8.8c6ce8",\r
-                "1a4f2a93.c11d2d"\r
+                "302e8991.9483b6",\r
+                "d2ac9909.c7d83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2e19c98.abbc4",\r
+        "id": "715b7a53.d039d4",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == 0 (domainA)",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1522,\r
-        "y": 1179,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1534,\r
+        "y": 1188,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "11383ee6.e1d7d9",\r
-                "6fa9ae0c.501d18"\r
+                "f53c2621.eb9438",\r
+                "1c719c21.ec9b04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11383ee6.e1d7d9",\r
+        "id": "f53c2621.eb9438",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1723,\r
-        "y": 1177,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1735,\r
+        "y": 1186,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b4854ac4.e47338"\r
+                "39a7b2e1.a50fbe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2b0b006.cad94",\r
+        "id": "b0d2a923.51103",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 2004,\r
-        "y": 1127,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2016,\r
+        "y": 1136,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b58456d.2aa8c4",\r
+        "id": "c9652673.c83de8",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == last (domainB)",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1940,\r
-        "y": 1228,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1952,\r
+        "y": 1237,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7d1f463f.75db48",\r
-                "1703470e.535939"\r
+                "ab876b76.0d0a8",\r
+                "2a964a93.a3cb96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d1f463f.75db48",\r
+        "id": "ab876b76.0d0a8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2170,\r
-        "y": 1224,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2182,\r
+        "y": 1233,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "1c45c1ae.cc5246"\r
+                "62dd94dd.71b75c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fa9ae0c.501d18",\r
+        "id": "1c719c21.ec9b04",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1723,\r
-        "y": 1226,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1735,\r
+        "y": 1235,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5b58456d.2aa8c4"\r
+                "c9652673.c83de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1703470e.535939",\r
+        "id": "2a964a93.a3cb96",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2171,\r
-        "y": 1270,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2183,\r
+        "y": 1279,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "9a461e80.88ba58"\r
+                "1f38645a.fd2454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a461e80.88ba58",\r
+        "id": "1f38645a.fd2454",\r
         "type": "set",\r
         "name": "set attachment_param domain G",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
         "comments": "",\r
-        "x": 2385,\r
-        "y": 1270,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2397,\r
+        "y": 1279,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9594ef.146e23",\r
+        "id": "ada84f30.11bba8",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
         "comments": "",\r
-        "x": 2059,\r
-        "y": 1174,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2071,\r
+        "y": 1183,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4854ac4.e47338",\r
+        "id": "39a7b2e1.a50fbe",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1847,\r
-        "y": 1168,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1859,\r
+        "y": 1177,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "d9594ef.146e23"\r
+                "ada84f30.11bba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c45c1ae.cc5246",\r
+        "id": "62dd94dd.71b75c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2303,\r
-        "y": 1200,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2315,\r
+        "y": 1209,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "c5fb0dfd.a15ba"\r
+                "c86a8489.80e7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca07a786.2d259",\r
+        "id": "dce0c80a.efad",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 2459,\r
-        "y": 1216,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2471,\r
+        "y": 1225,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5fb0dfd.a15ba",\r
+        "id": "c86a8489.80e7c",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",\r
         "comments": "",\r
-        "x": 2507,\r
-        "y": 1168,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2519,\r
+        "y": 1177,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b291bad0.bdbf18",\r
+        "id": "d0d3740b.46215",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2024,\r
-        "y": 3471,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2036,\r
+        "y": 3480,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "62a1848.f7c8bfc"\r
+                "822b4a87.c6d91"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec243f0e.e78df8",\r
+        "id": "df45bcf4.ab6068",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domain otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2499,\r
-        "y": 3456,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2511,\r
+        "y": 3465,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b5d0d456.d5e17",\r
+        "id": "92ea7ec.b1b38",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2437,\r
-        "y": 3506,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2449,\r
+        "y": 3515,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1472c185.25ef66",\r
+        "id": "ab274de2.98aaf8",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2574,\r
-        "y": 3605,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2586,\r
+        "y": 3614,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "937a1753.6c2cd",\r
+        "id": "ba000585.cff088",\r
         "type": "comment",\r
         "name": "connectivity has not been created for middle domains, so we have to create one",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2577,\r
-        "y": 3397,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2589,\r
+        "y": 3406,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3fb48dac.724cba",\r
+        "id": "fe394c67.6a4738",\r
         "type": "save",\r
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2542,\r
-        "y": 3664,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2554,\r
+        "y": 3673,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "62a1848.f7c8bfc",\r
+        "id": "822b4a87.c6d91",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2181,\r
-        "y": 3472,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2193,\r
+        "y": 3481,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ec243f0e.e78df8",\r
-                "b5d0d456.d5e17",\r
-                "1472c185.25ef66",\r
-                "3fb48dac.724cba",\r
-                "d9f949c2.b1be88",\r
-                "d2c94e3.4db213"\r
+                "df45bcf4.ab6068",\r
+                "92ea7ec.b1b38",\r
+                "ab274de2.98aaf8",\r
+                "fe394c67.6a4738",\r
+                "b6a44371.9af948",\r
+                "c51d1d37.88a2f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9f949c2.b1be88",\r
+        "id": "b6a44371.9af948",\r
         "type": "set",\r
         "name": "set attachment_param domain otnidx",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 2456,\r
-        "y": 3724,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2468,\r
+        "y": 3733,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef8123f7.a43b88",\r
+        "id": "6f21b0a4.c1ba8",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 392,\r
-        "y": 2894,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 404,\r
+        "y": 2903,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36cc6c32.a7a5bc",\r
+        "id": "5f4f339e.018654",\r
         "type": "set",\r
         "name": "set srcTtp OTN layer",\r
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 433,\r
-        "y": 906,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 445,\r
+        "y": 915,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "424b4783.7d233",\r
+        "id": "5ba25870.61d0e",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-B, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3025,\r
-        "y": 3155,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3037,\r
+        "y": 3164,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "733089d7.e1acb",\r
+        "id": "ea374103.b6422",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-A, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainA-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2139,\r
-        "y": 2911,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2151,\r
+        "y": 2920,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d2c94e3.4db213",\r
+        "id": "c51d1d37.88a2f8",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2538,\r
-        "y": 3551,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2550,\r
+        "y": 3560,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7261999.9881d8",\r
+        "id": "6512efb1.123b28",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man?",\r
         "xml": "<switch test='`$found-middle-man`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2357,\r
-        "y": 3155,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2369,\r
+        "y": 3164,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2bb32459.fcac64"\r
+                "4373daa0.a1c174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bb32459.fcac64",\r
+        "id": "4373daa0.a1c174",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2544,\r
-        "y": 3155,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2556,\r
+        "y": 3164,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5a6ce6ad.7fc7a"\r
+                "11cd0588.41272a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6075d4e4.60740c",\r
+        "id": "84c92d78.7984b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2139,\r
-        "y": 3205,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2151,\r
+        "y": 3214,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7c7e82f.b5a9efc",\r
-                "383da81a.536a28",\r
-                "a7261999.9881d8"\r
+                "ef7c2251.5fe8a8",\r
+                "b19fce04.44ae8",\r
+                "6512efb1.123b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c7e82f.b5a9efc",\r
+        "id": "ef7c2251.5fe8a8",\r
         "type": "save",\r
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2455,\r
-        "y": 3253,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2467,\r
+        "y": 3262,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "383da81a.536a28",\r
+        "id": "b19fce04.44ae8",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",\r
         "comments": "",\r
-        "x": 2382,\r
-        "y": 3313,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2394,\r
+        "y": 3322,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cddff981.827d58",\r
+        "id": "d80a0f45.0378e",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 443,\r
-        "y": 3913,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 455,\r
+        "y": 3922,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2d49e0b.d9e87a",\r
-                "73d650d6.cd1c1",\r
-                "77ce79ba.222c68"\r
+                "24e9e35d.66377c",\r
+                "ba022563.b1ca78",\r
+                "e3577813.56f32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d49e0b.d9e87a",\r
+        "id": "24e9e35d.66377c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 631,\r
-        "y": 3926,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 643,\r
+        "y": 3935,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "886559d2.9d2008"\r
+                "b86628e9.5b571"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73d650d6.cd1c1",\r
+        "id": "ba022563.b1ca78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 631.490966796875,\r
-        "y": 3971.5740356445312,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 643.490966796875,\r
+        "y": 3980.5740356445312,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "22427bb5.1c0494"\r
+                "dd8f81c4.9e7f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77ce79ba.222c68",\r
+        "id": "e3577813.56f32",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 629,\r
-        "y": 4015,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 641,\r
+        "y": 4024,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "8183af0e.979c3"\r
+                "7aca1801.7911a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "886559d2.9d2008",\r
+        "id": "b86628e9.5b571",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 804,\r
-        "y": 3924,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 816,\r
+        "y": 3933,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5d380762.82e9"\r
+                "247b0f83.24d55"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22427bb5.1c0494",\r
+        "id": "dd8f81c4.9e7f98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 794.0623779296875,\r
-        "y": 3971.8597717285156,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 806.0623779296875,\r
+        "y": 3980.8597717285156,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8183af0e.979c3",\r
+        "id": "7aca1801.7911a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 796,\r
-        "y": 4014,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 808,\r
+        "y": 4023,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7aad5876.b17588",\r
+        "id": "be1c598f.c95108",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 432,\r
-        "y": 4104,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 444,\r
+        "y": 4113,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "d9d281f0.871208"\r
+                "5abd279e.a9bea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7032c836.ea98e",\r
+        "id": "42fde1a9.9a4a98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1242,\r
-        "y": 4104,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1254,\r
+        "y": 4113,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "bcf06c77.b9d56"\r
+                "bf9e1c4b.a2ce9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6fa6f89.c5ed98",\r
+        "id": "3cd4b283.9423f6",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1014,\r
-        "y": 4104,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1026,\r
+        "y": 4113,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7032c836.ea98e"\r
+                "42fde1a9.9a4a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d380762.82e9",\r
+        "id": "247b0f83.24d55",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1033,\r
-        "y": 3925,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1045,\r
+        "y": 3934,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "4b806fec.cf791"\r
+                "a4896672.ff36c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b806fec.cf791",\r
+        "id": "a4896672.ff36c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1248,\r
-        "y": 3926,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1260,\r
+        "y": 3935,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5269aed8.1067"\r
+                "f571db46.1bfcb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcf06c77.b9d56",\r
+        "id": "bf9e1c4b.a2ce9",\r
         "type": "set",\r
         "name": "set attachment_param sliceG",\r
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",\r
         "comments": "",\r
-        "x": 1495,\r
-        "y": 4102,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1507,\r
+        "y": 4111,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "678bb9be.2e7528",\r
+        "id": "5df62aff.b0027c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode sliceG creation domainG",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1080,\r
-        "y": 4210,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1092,\r
+        "y": 4219,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "273fc863.468be8",\r
-                "6eaa45ca.9bba14"\r
+                "e89a613f.801198",\r
+                "c394a514.3653"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6eaa45ca.9bba14",\r
+        "id": "c394a514.3653",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1363,\r
-        "y": 4190,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1375,\r
+        "y": 4199,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "562a3e0b.c715a8"\r
+                "ba5b687c.dd6a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "273fc863.468be8",\r
+        "id": "e89a613f.801198",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1364.0002136230469,\r
-        "y": 4240.99990940094,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1376.0002136230469,\r
+        "y": 4249.99990940094,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "3cb4038b.3f740c"\r
+                "b0106af6.430b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "562a3e0b.c715a8",\r
+        "id": "ba5b687c.dd6a6",\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 slice creation api for domain A\" />\n",\r
         "comments": "",\r
-        "x": 1503.0002479553223,\r
-        "y": 4190.000000953674,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1515.0002479553223,\r
+        "y": 4199.000000953674,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3cb4038b.3f740c",\r
+        "id": "b0106af6.430b1",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1509.0272598266602,\r
-        "y": 4238.745394706726,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1521.0272598266602,\r
+        "y": 4247.745394706726,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9d281f0.871208",\r
+        "id": "5abd279e.a9bea8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 664,\r
-        "y": 4102,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 676,\r
+        "y": 4111,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "d6fa6f89.c5ed98",\r
-                "678bb9be.2e7528"\r
+                "3cd4b283.9423f6",\r
+                "5df62aff.b0027c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5269aed8.1067",\r
+        "id": "f571db46.1bfcb",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1492,\r
-        "y": 3925,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1504,\r
+        "y": 3934,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ff386dcd.32782",\r
-                "224e1e2e.4d20a2"\r
+                "10584e74.11a9e2",\r
+                "3270eb36.2e6c2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "502add97.5e708c",\r
+        "id": "cbeb21d2.528fb",\r
         "type": "set",\r
         "name": "set providerValue",\r
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",\r
         "comments": "",\r
-        "x": 2134,\r
-        "y": 3871,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2146,\r
+        "y": 3880,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "521605a6.12e2d4",\r
+        "id": "7855d996.5f07",\r
         "type": "switchNode",\r
         "name": "switch $tmp.arr_length != 0",\r
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2167,\r
-        "y": 3926,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2179,\r
+        "y": 3935,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b6840948.dcaf28",\r
-                "16f9a591.80cc1a"\r
+                "be28c030.0047c",\r
+                "f9d12f18.1e0e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6840948.dcaf28",\r
+        "id": "be28c030.0047c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2363,\r
-        "y": 3896,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2375,\r
+        "y": 3905,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "d20ee31a.4da818"\r
+                "cca5c1e0.c9e418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16f9a591.80cc1a",\r
+        "id": "f9d12f18.1e0e1",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2364,\r
-        "y": 3967,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2376,\r
+        "y": 3976,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "932a25a5.21db58"\r
+                "1c2a1c2d.eddd2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff386dcd.32782",\r
+        "id": "10584e74.11a9e2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1709,\r
-        "y": 3904,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1721,\r
+        "y": 3913,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "fa5ee789.0417f8"\r
+                "66fe7551.116524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "224e1e2e.4d20a2",\r
+        "id": "3270eb36.2e6c2c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1709,\r
-        "y": 3953,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1721,\r
+        "y": 3962,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa5ee789.0417f8",\r
+        "id": "66fe7551.116524",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1877,\r
-        "y": 3904,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1889,\r
+        "y": 3913,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "502add97.5e708c",\r
-                "521605a6.12e2d4"\r
+                "cbeb21d2.528fb",\r
+                "7855d996.5f07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d20ee31a.4da818",\r
+        "id": "cca5c1e0.c9e418",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2514,\r
-        "y": 3894,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2526,\r
+        "y": 3903,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "4f6df904.ee87c",\r
-                "66254394.195084"\r
+                "6021fe00.cf5b38",\r
+                "3ee35cda.cacc94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "932a25a5.21db58",\r
+        "id": "1c2a1c2d.eddd2c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2516,\r
-        "y": 3967,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2528,\r
+        "y": 3976,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "de1fa04c.85c2d",\r
-                "2aeb6e74.e24be2"\r
+                "b88403d3.b550c",\r
+                "df79ce65.0d4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f6df904.ee87c",\r
+        "id": "6021fe00.cf5b38",\r
         "type": "for",\r
         "name": "for arridx in tmp.arr",\r
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2701,\r
-        "y": 3846,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2713,\r
+        "y": 3855,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "e9ecc81b.49bbd"\r
+                "70402202.48ed14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9ecc81b.49bbd",\r
+        "id": "70402202.48ed14",\r
         "type": "switchNode",\r
         "name": "switch tmp.arr[$arridx] == $providerValue",\r
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2992,\r
-        "y": 3846,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3004,\r
+        "y": 3855,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "42d5ed25.b49c94",\r
-                "c705b865.d0eb4"\r
+                "f629fdf.6a8538",\r
+                "a317d92b.3b0b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42d5ed25.b49c94",\r
+        "id": "f629fdf.6a8538",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3267,\r
-        "y": 3815,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3279,\r
+        "y": 3824,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "5660632c.265cdc"\r
+                "a51325a8.b7388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c705b865.d0eb4",\r
+        "id": "a317d92b.3b0b18",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3268,\r
-        "y": 3886,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3280,\r
+        "y": 3895,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "a7a2aba3.cd08b8"\r
+                "9d65717e.a373d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5660632c.265cdc",\r
+        "id": "a51325a8.b7388",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3418,\r
-        "y": 3813,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3430,\r
+        "y": 3822,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "99e18478.d4208",\r
-                "c48a358e.19c528",\r
-                "23bf4d27.c1b37a",\r
-                "85bd9e57.66c34",\r
-                "747fe7dc.036f4"\r
+                "3791e48.3b8af9c",\r
+                "a673fd66.c40df",\r
+                "86199d64.75edc8",\r
+                "51a35674.c610f8",\r
+                "445052f3.f38194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de1fa04c.85c2d",\r
+        "id": "b88403d3.b550c",\r
         "type": "save",\r
         "name": "store $arridx somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2771,\r
-        "y": 3960,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2783,\r
+        "y": 3969,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2aeb6e74.e24be2",\r
+        "id": "df79ce65.0d4e",\r
         "type": "set",\r
         "name": "set twoD array",\r
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",\r
         "comments": "",\r
-        "x": 2699,\r
-        "y": 4007,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2711,\r
+        "y": 4016,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66254394.195084",\r
+        "id": "3ee35cda.cacc94",\r
         "type": "switchNode",\r
         "name": "switch found?",\r
         "xml": "<switch test='`$found`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2692,\r
-        "y": 3891,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2704,\r
+        "y": 3900,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6f0ec490.03677c",\r
-                "bc11802a.75d5c8"\r
+                "b2a6fca5.77cd68",\r
+                "c6caa4c6.b68ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f0ec490.03677c",\r
+        "id": "b2a6fca5.77cd68",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2852,\r
-        "y": 3883,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2864,\r
+        "y": 3892,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "843f963d.3c00d"\r
+                "697e3e96.9c5648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc11802a.75d5c8",\r
+        "id": "c6caa4c6.b68ae",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2850,\r
-        "y": 3920,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2862,\r
+        "y": 3929,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "f82ccccf.a16c6"\r
+                "c8a03883.695728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "843f963d.3c00d",\r
+        "id": "697e3e96.9c5648",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2977,\r
-        "y": 3883,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2989,\r
+        "y": 3892,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc11c549.4cf3f",\r
+        "id": "7ed231c3.f2fd1",\r
         "type": "save",\r
         "name": "store $arridx+1 somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3284,\r
-        "y": 3941,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3296,\r
+        "y": 3950,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f82ccccf.a16c6",\r
+        "id": "c8a03883.695728",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3010,\r
-        "y": 3928,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3022,\r
+        "y": 3937,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "dc11c549.4cf3f",\r
-                "3879ac46.8861b4"\r
+                "7ed231c3.f2fd1",\r
+                "2d908152.4ff6a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3879ac46.8861b4",\r
+        "id": "2d908152.4ff6a6",\r
         "type": "set",\r
         "name": "set twoD array",\r
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",\r
         "comments": "",\r
-        "x": 3201,\r
-        "y": 3987,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3213,\r
+        "y": 3996,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7a2aba3.cd08b8",\r
+        "id": "9d65717e.a373d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3401,\r
-        "y": 3885,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3413,\r
+        "y": 3894,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "99e18478.d4208",\r
+        "id": "3791e48.3b8af9c",\r
         "type": "set",\r
         "name": "set found to true",\r
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",\r
         "comments": "",\r
-        "x": 3606,\r
-        "y": 3773,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3618,\r
+        "y": 3782,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c48a358e.19c528",\r
+        "id": "a673fd66.c40df",\r
         "type": "save",\r
         "name": "store $arridx somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3678,\r
-        "y": 3818,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3690,\r
+        "y": 3827,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "747fe7dc.036f4",\r
+        "id": "445052f3.f38194",\r
         "type": "set",\r
         "name": "set twoD arr",\r
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",\r
         "comments": "",\r
-        "x": 3593,\r
-        "y": 3945,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3605,\r
+        "y": 3954,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85bd9e57.66c34",\r
+        "id": "51a35674.c610f8",\r
         "type": "set",\r
         "name": "set sizeOfSliceList",\r
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 3614,\r
-        "y": 3881,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3626,\r
+        "y": 3890,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23bf4d27.c1b37a",\r
+        "id": "86199d64.75edc8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3572,\r
-        "y": 4012,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3584,\r
+        "y": 4021,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c99e01d1.0f1de8",\r
+        "id": "6a22d3fb.3389bc",\r
         "type": "comment",\r
         "name": "Important Comment",\r
         "info": "When we are in F1, it means that, either:\nno-middle-man found\nor\nmiddle-man was found but PCE is needed.\n\nNo matter which scenario brings us to F1, vpn-binding-B is a \nnew vpn-binding so it needs to be attached to the:\nmiddle-man && connectivityB",\r
         "comments": "",\r
-        "x": 2352,\r
-        "y": 3202,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2364,\r
+        "y": 3211,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11040b46.8e035d",\r
+        "id": "13d7f319.f10ffd",\r
         "type": "set",\r
         "name": "set srcTtp+dstTtp pair",\r
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 1498,\r
-        "y": 1259,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1510,\r
+        "y": 1268,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e17d72f.d352d",\r
+        "id": "9673bbc9.e232d8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1691,\r
-        "y": 1356,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1703,\r
+        "y": 1365,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "130409d7.ba1cfe",\r
+        "id": "fe43d4e7.2e266",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",\r
         "comments": "",\r
-        "x": 1562,\r
-        "y": 1310,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1574,\r
+        "y": 1319,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ea79a81.da9f1d",\r
+        "id": "8c1ff0ec.d0238",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1371,\r
-        "y": 1511,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1383,\r
+        "y": 1520,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "1956e28a.ad4365",\r
-                "404765c9.b1c294"\r
+                "43f2090.27bb178",\r
+                "78a0670.cf2d998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1956e28a.ad4365",\r
+        "id": "43f2090.27bb178",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1657,\r
-        "y": 2330,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1669,\r
+        "y": 2339,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "cd58f3fe.5b5bd"\r
+                "c80f5b2c.e8799"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6504cf8.a4c5e",\r
+        "id": "340621d.c4a9c5e",\r
         "type": "comment",\r
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",\r
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",\r
         "comments": "",\r
-        "x": 2083,\r
-        "y": 2275,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2095,\r
+        "y": 2284,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c480e3.f82397",\r
+        "id": "b5382f7e.2bd898",\r
         "type": "comment",\r
         "name": "create a new connectivity",\r
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",\r
         "comments": "",\r
-        "x": 1894,\r
-        "y": 1487,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1906,\r
+        "y": 1496,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b5847157.d9e138",\r
+        "id": "be6ceee2.825c9",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1997,\r
-        "y": 1523,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2009,\r
+        "y": 1532,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "dff931e6.5a9578"\r
+                "cf21392c.4841d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dff931e6.5a9578",\r
+        "id": "cf21392c.4841d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2285,\r
-        "y": 1524,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2297,\r
+        "y": 1533,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "bf3d635b.09f94"\r
+                "7f292268.acccbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf3d635b.09f94",\r
+        "id": "7f292268.acccbc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2468.5,\r
-        "y": 1522.25390625,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2480.5,\r
+        "y": 1531.25390625,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6cbdac8a.378604",\r
+        "id": "16c5a50f.2f8633",\r
         "type": "execute",\r
         "name": "execute string.contains srcTtpdstTtpPair",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2071,\r
-        "y": 2327,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2083,\r
+        "y": 2336,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "1b949e6d.080772",\r
-                "e453c4d5.ba435"\r
+                "452b77d1.b4f2a8",\r
+                "b1806606.25c148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b949e6d.080772",\r
+        "id": "452b77d1.b4f2a8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2244,\r
-        "y": 2175,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2256,\r
+        "y": 2184,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e453c4d5.ba435",\r
+        "id": "b1806606.25c148",\r
         "type": "outcomeFalse",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2276,\r
-        "y": 2434,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2288,\r
+        "y": 2443,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "80b2f89e.8a165"\r
+                "28b98f8a.d66ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dc11394.4d1084",\r
+        "id": "65dfad8a.1bcc14",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2683,\r
-        "y": 1965,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2695,\r
+        "y": 1974,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "22dcb38b.c85a54"\r
+                "685af2d8.b662dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22dcb38b.c85a54",\r
+        "id": "685af2d8.b662dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2987,\r
-        "y": 1962,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2999,\r
+        "y": 1971,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "708eeb6a.f5aefc"\r
+                "edef5d31.f27bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "708eeb6a.f5aefc",\r
+        "id": "edef5d31.f27bb8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3137.5,\r
-        "y": 1969.25390625,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3149.5,\r
+        "y": 1978.25390625,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "74407b46.6458d4",\r
+        "id": "fca1e078.90281",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domain otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1977,\r
-        "y": 1578,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1989,\r
+        "y": 1587,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3919fe25.6022b2",\r
+        "id": "84e90fcb.be7ce",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1915,\r
-        "y": 1628,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1927,\r
+        "y": 1637,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7aa6415.034e74",\r
+        "id": "548a399a.3a9a1",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2016,\r
-        "y": 1673,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2028,\r
+        "y": 1682,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e6bc04b6.f68c7",\r
+        "id": "ea27a84e.a57e98",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2052,\r
-        "y": 1727,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2064,\r
+        "y": 1736,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b2ea866b.5e679",\r
+        "id": "688a1580.c26934",\r
         "type": "save",\r
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2020,\r
-        "y": 1786,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2032,\r
+        "y": 1795,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e878616a.51fa2",\r
+        "id": "ab8e2668.029e08",\r
         "type": "comment",\r
         "name": "find middle-man's eth-srv-name",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1478,\r
-        "y": 1402,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1490,\r
+        "y": 1411,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0ca8ca2.d5c31",\r
+        "id": "84f3d24d.36c17",\r
         "type": "set",\r
         "name": "set prop.ethernet-service-name",\r
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",\r
         "comments": "",\r
-        "x": 1500,\r
-        "y": 1446,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1512,\r
+        "y": 1455,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55a4c230.fd03fc",\r
+        "id": "ae53151f.a2887",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2707,\r
-        "y": 2182,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2719,\r
+        "y": 2191,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8a76ccc1.2cd108",\r
+        "id": "4e7cd680.120818",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2738,\r
-        "y": 2221,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2750,\r
+        "y": 2230,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1837f35e.96c455",\r
+        "id": "ecdbcb6.a92d738",\r
         "type": "save",\r
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2709,\r
-        "y": 2294,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2721,\r
+        "y": 2303,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f94cb118.7c3c88",\r
+        "id": "82dff351.eb0b18",\r
         "type": "comment",\r
         "name": "update the founded connectivity to have a new coupling-flag",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2679,\r
-        "y": 2010,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2691,\r
+        "y": 2019,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12e95810.e72c78",\r
+        "id": "4af074ca.bd591c",\r
         "type": "set",\r
         "name": "set newFlag",\r
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2565,\r
-        "y": 2049,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2577,\r
+        "y": 2058,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33021018.a90398",\r
+        "id": "5e632476.eb799c",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2629,\r
-        "y": 2094,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2641,\r
+        "y": 2103,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75b8be3d.85a8b8",\r
+        "id": "6b3b57c6.7c8f5",\r
         "type": "comment",\r
         "name": "the following two relationships should have already been there; if not => error",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2721,\r
-        "y": 2144,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2733,\r
+        "y": 2153,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "158258b6.b1e20f",\r
+        "id": "453ea410.800c04",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1707,\r
-        "y": 1511,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1719,\r
+        "y": 1520,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "b5847157.d9e138",\r
-                "74407b46.6458d4",\r
-                "3919fe25.6022b2",\r
-                "7aa6415.034e74",\r
-                "e6bc04b6.f68c7",\r
-                "b2ea866b.5e679"\r
+                "be6ceee2.825c9",\r
+                "fca1e078.90281",\r
+                "84e90fcb.be7ce",\r
+                "548a399a.3a9a1",\r
+                "ea27a84e.a57e98",\r
+                "688a1580.c26934"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "404765c9.b1c294",\r
+        "id": "78a0670.cf2d998",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1569,\r
-        "y": 1507,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 1581,\r
+        "y": 1516,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "158258b6.b1e20f"\r
+                "453ea410.800c04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd58f3fe.5b5bd",\r
+        "id": "c80f5b2c.e8799",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2367,\r
-        "y": 1974,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2379,\r
+        "y": 1983,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7dc11394.4d1084",\r
-                "12e95810.e72c78",\r
-                "33021018.a90398",\r
-                "1837f35e.96c455"\r
+                "65dfad8a.1bcc14",\r
+                "4af074ca.bd591c",\r
+                "5e632476.eb799c",\r
+                "ecdbcb6.a92d738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af6449ff.709108",\r
+        "id": "f5aa86ab.3de758",\r
         "type": "comment",\r
         "name": "loop through the relationships of this founded connectivity, then",\r
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",\r
         "comments": "",\r
-        "x": 2372,\r
-        "y": 2399,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2384,\r
+        "y": 2408,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e1d6f3c3.08e8e8",\r
+        "id": "8608bc09.df0608",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2714,\r
-        "y": 2435,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2726,\r
+        "y": 2444,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "32ed93c7.c50234"\r
+                "5d08ac03.36d834"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32ed93c7.c50234",\r
+        "id": "5d08ac03.36d834",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2926,\r
-        "y": 2433,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2938,\r
+        "y": 2442,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6fea52d2.2a0434"\r
+                "d7fbd393.802b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fea52d2.2a0434",\r
+        "id": "d7fbd393.802b28",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3110,\r
-        "y": 2431,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3122,\r
+        "y": 2440,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "37563c96.a6fb74"\r
+                "7b17a25c.8a3ecc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37563c96.a6fb74",\r
+        "id": "7b17a25c.8a3ecc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3289,\r
-        "y": 2436,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3301,\r
+        "y": 2445,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "91050f7b.03c5c",\r
-                "30dac6e0.2f0b42"\r
+                "404536aa.fd072",\r
+                "ebe21a38.772d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30dac6e0.2f0b42",\r
+        "id": "ebe21a38.772d1",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 3506,\r
-        "y": 2367,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3518,\r
+        "y": 2376,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91050f7b.03c5c",\r
+        "id": "404536aa.fd072",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3499,\r
-        "y": 2453,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3511,\r
+        "y": 2462,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "f42d3c95.007658",\r
-                "d20958c8.44b1d",\r
-                "dc1061ac.3194b8"\r
+                "82eb023b.8b6878",\r
+                "3917c696.d9cc82",\r
+                "ad895865.ea3bc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d20958c8.44b1d",\r
+        "id": "3917c696.d9cc82",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3712.490966796875,\r
-        "y": 2437.5740356445312,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3724.490966796875,\r
+        "y": 2446.5740356445312,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "266b5e5.4c2c022"\r
+                "33dd47ac.b200d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "266b5e5.4c2c022",\r
+        "id": "33dd47ac.b200d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3875.0625,\r
-        "y": 2436.8597412109375,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3887.0625,\r
+        "y": 2445.8597412109375,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce39d5ca.3eb7",\r
+        "id": "49f1ea3b.eabc34",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3876,\r
-        "y": 2482,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3888,\r
+        "y": 2491,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc1061ac.3194b8",\r
+        "id": "ad895865.ea3bc8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3708,\r
-        "y": 2482,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3720,\r
+        "y": 2491,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "ce39d5ca.3eb7"\r
+                "49f1ea3b.eabc34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f42d3c95.007658",\r
+        "id": "82eb023b.8b6878",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3710,\r
-        "y": 2542,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3722,\r
+        "y": 2551,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2eba9c97.d9e8d4"\r
+                "cb43f8c5.5d2f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eba9c97.d9e8d4",\r
+        "id": "cb43f8c5.5d2f9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3879,\r
-        "y": 2541,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 3891,\r
+        "y": 2550,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "7126e3c.be80d9c"\r
+                "b8d3290b.70429"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80b2f89e.8a165",\r
+        "id": "28b98f8a.d66ba8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2503,\r
-        "y": 2433,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2515,\r
+        "y": 2442,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "e1d6f3c3.08e8e8",\r
-                "13b057e7.5ede5",\r
-                "8583f674.cce2c"\r
+                "8608bc09.df0608",\r
+                "57ababe0.ec3414",\r
+                "52276af3.2f9a4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7126e3c.be80d9c",\r
+        "id": "b8d3290b.70429",\r
         "type": "switchNode",\r
         "name": "switch srcTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4078,\r
-        "y": 2542,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4090,\r
+        "y": 2551,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "379157c3.0db038"\r
+                "4ce3e8eb.f24da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "379157c3.0db038",\r
+        "id": "4ce3e8eb.f24da8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4241,\r
-        "y": 2540,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4253,\r
+        "y": 2549,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "45526f50.00e348"\r
+                "18f785cc.cf347a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45526f50.00e348",\r
+        "id": "18f785cc.cf347a",\r
         "type": "switchNode",\r
         "name": "switch dstTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4422,\r
-        "y": 2540,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4434,\r
+        "y": 2549,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "2e6d0f9b.a0852"\r
+                "988f1cd5.aa027"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e6d0f9b.a0852",\r
+        "id": "988f1cd5.aa027",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4585,\r
-        "y": 2538,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4597,\r
+        "y": 2547,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "6b6a34b7.0f115c"\r
+                "9caa890d.344aa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22e286e0.93668a",\r
+        "id": "dd1b26b2.35eef",\r
         "type": "set",\r
         "name": "set tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",\r
         "comments": "",\r
-        "x": 4942,\r
-        "y": 2545,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4954,\r
+        "y": 2554,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b6a34b7.0f115c",\r
+        "id": "9caa890d.344aa8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4724,\r
-        "y": 2537,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4736,\r
+        "y": 2546,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             [\r
-                "22e286e0.93668a",\r
-                "db1e7b85.850cb8"\r
+                "dd1b26b2.35eef",\r
+                "69c80295.f3b48c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db1e7b85.850cb8",\r
+        "id": "69c80295.f3b48c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4888,\r
-        "y": 2589,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 4900,\r
+        "y": 2598,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13b057e7.5ede5",\r
+        "id": "57ababe0.ec3414",\r
         "type": "set",\r
         "name": "unset tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 2724,\r
-        "y": 2396,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2736,\r
+        "y": 2405,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d0325f2.b257c",\r
+        "id": "b81a7ea3.f58288",\r
         "type": "comment",\r
         "name": "increase the bw of the-vpn-binding and change status to modified",\r
         "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
-        "x": 2813,\r
-        "y": 2570,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2825,\r
+        "y": 2579,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8583f674.cce2c",\r
+        "id": "52276af3.2f9a4c",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2783,\r
-        "y": 2630,\r
-        "z": "a911d5ff.5ac84",\r
+        "x": 2795,\r
+        "y": 2639,\r
+        "z": "4fb14ce0.40eb24",\r
         "wires": [\r
             []\r
         ]\r
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
new file mode 100644 (file)
index 0000000..5fb8945
--- /dev/null
@@ -0,0 +1,1099 @@
+[\r
+    {\r
+        "id": "931a69bb.dae57",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 158,\r
+        "y": 111,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "631f62d5.74088c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "631f62d5.74088c",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 289.2856903076172,\r
+        "y": 160.23810863494873,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "b7a67e25.a3d65"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b7a67e25.a3d65",\r
+        "type": "method",\r
+        "name": "method cll-vnf-topology-operation-cll-delete",\r
+        "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 292.4286193847656,\r
+        "y": 245.00003242492676,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "bcc86fda.38b13"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bcc86fda.38b13",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 442.238037109375,\r
+        "y": 374.6666564941406,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "f53defcd.3a7dd",\r
+                "c20e131e.73b7b",\r
+                "d160ef14.daae98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f53defcd.3a7dd",\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": 716.5716552734375,\r
+        "y": 641.59716796875,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c20e131e.73b7b",\r
+        "type": "save",\r
+        "name": "get service-instance from aai",\r
+        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 768,\r
+        "y": 412,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "73ebc7bf.bf03e8",\r
+                "4161fc92.ab54b4",\r
+                "f0a5f72e.4756d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73ebc7bf.bf03e8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 987,\r
+        "y": 350,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "5b569a16.745f1c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4161fc92.ab54b4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 996.490966796875,\r
+        "y": 392.57403564453125,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "8782adc7.ab141"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f0a5f72e.4756d",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 985,\r
+        "y": 439,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "ecf8d005.e02b48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8782adc7.ab141",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1150.0623779296875,\r
+        "y": 395.8597717285156,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ecf8d005.e02b48",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1154,\r
+        "y": 440,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5b569a16.745f1c",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1184,\r
+        "y": 346,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "25ca27fd.dbc988"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "25ca27fd.dbc988",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1407.33349609375,\r
+        "y": 345.99993896484375,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "f6a0c4df.5c0238"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f6a0c4df.5c0238",\r
+        "type": "outcome",\r
+        "name": "connectivity",\r
+        "xml": "<outcome value='connectivity'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1587.0001220703125,\r
+        "y": 346.0000305175781,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "b1afa8c.9d08258"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d160ef14.daae98",\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' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 734,\r
+        "y": 360,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b1afa8c.9d08258",\r
+        "type": "save",\r
+        "name": "get connectivity from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1787,\r
+        "y": 346,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "c3a2010c.f5d48",\r
+                "fb144142.e9ac68",\r
+                "ba20a9b3.14be2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c3a2010c.f5d48",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1958,\r
+        "y": 299,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "9386fbbc.1d2048"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb144142.e9ac68",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2039.490966796875,\r
+        "y": 1139.5740356445312,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "9e1c850d.74d728"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba20a9b3.14be2",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2037,\r
+        "y": 1183,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "c9b57000.53acb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e1c850d.74d728",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2202.0623779296875,\r
+        "y": 1139.8597717285156,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c9b57000.53acb8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 2206,\r
+        "y": 1184,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ad889722.664b08",\r
+        "type": "save",\r
+        "name": "get vpn-binding from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3062,\r
+        "y": 386,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "640b0e20.b1d3e",\r
+                "ce9c63b.0255a2",\r
+                "7ad6314d.3b89c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e28a48f8.db57f8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3439,\r
+        "y": 378,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "1c93c389.0c8c2c",\r
+                "c798ad9c.1234b",\r
+                "fd7fa756.f7d6e8",\r
+                "270a4545.e66b22",\r
+                "d4768fc2.d5865"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "640b0e20.b1d3e",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3273,\r
+        "y": 388,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "e28a48f8.db57f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce9c63b.0255a2",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3273.490966796875,\r
+        "y": 433.57403564453125,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "714cc291.22ce0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7ad6314d.3b89c8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3271,\r
+        "y": 477,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "525b4279.2df8f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "525b4279.2df8f4",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 3438,\r
+        "y": 476,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "714cc291.22ce0c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3436.0623779296875,\r
+        "y": 433.8597717285156,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c57d1cb2.40bd38",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2261,\r
+        "y": 301,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "9dbcf55e.4925c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9dbcf55e.4925c8",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2458,\r
+        "y": 315,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "b564f315.834a2",\r
+                "e7d69f06.780b38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b564f315.834a2",\r
+        "type": "outcome",\r
+        "name": "vpn-binding",\r
+        "xml": "<outcome value='vpn-binding'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2626,\r
+        "y": 308,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "491489ec.617558"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "491489ec.617558",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2789,\r
+        "y": 308,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "ad889722.664b08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1c93c389.0c8c2c",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 3661,\r
+        "y": 96,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c798ad9c.1234b",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3687,\r
+        "y": 213,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "76dc6e0a.1ab268",\r
+                "826ceead.c2f69",\r
+                "d5b03fc8.b6e088"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76dc6e0a.1ab268",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3882.5001220703125,\r
+        "y": 165,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "feb1370b.46393"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "826ceead.c2f69",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3874.5001220703125,\r
+        "y": 220,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "f38f34bb.7a9748"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "feb1370b.46393",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4026.8824462890625,\r
+        "y": 164.65567016601562,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "21f3a77a.346fa8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "21f3a77a.346fa8",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4211,\r
+        "y": 163,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "a51bf440.0c5b6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a51bf440.0c5b6",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4406,\r
+        "y": 163,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "34e2f8df.de6cf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d5b03fc8.b6e088",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3879.5001220703125,\r
+        "y": 277,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "8eb64fc1.c84cd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8eb64fc1.c84cd",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4031.5001220703125,\r
+        "y": 278,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f38f34bb.7a9748",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4042.5001220703125,\r
+        "y": 221,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "41c68962.37006",\r
+        "type": "execute",\r
+        "name": "get 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 = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4994,\r
+        "y": 180,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "b0076b13.2e399",\r
+                "f818e30c.1ed2d",\r
+                "cd5ca056.adec1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb2612bc.a6aea8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4788,\r
+        "y": 167,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "a86d0a2.d48def8",\r
+                "41c68962.37006",\r
+                "3b61ff6d.8dced"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a86d0a2.d48def8",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domain id",\r
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5024,\r
+        "y": 128,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b0076b13.2e399",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5204,\r
+        "y": 171,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "9a62192a.51df38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f818e30c.1ed2d",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5196,\r
+        "y": 226,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "cb7716d3.6ef01"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd5ca056.adec1",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5201,\r
+        "y": 283,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "6a7cfa93.2ccb4c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a7cfa93.2ccb4c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5353,\r
+        "y": 284,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb7716d3.6ef01",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5364,\r
+        "y": 229,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9a62192a.51df38",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5348.38232421875,\r
+        "y": 168.65567016601562,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "1e654428.bcfdbc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "34e2f8df.de6cf8",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4609,\r
+        "y": 167,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "fb2612bc.a6aea8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e654428.bcfdbc",\r
+        "type": "set",\r
+        "name": "set controller domain data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 5563,\r
+        "y": 165,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3b61ff6d.8dced",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 4944,\r
+        "y": 244,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10401b5c.b05865",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete ethernet Service without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4322,\r
+        "y": 593,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "7f6c606d.64ab48",\r
+                "c3eb517a.b7781"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7f6c606d.64ab48",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4668.5,\r
+        "y": 586,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "8c5003e.5a8698"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c3eb517a.b7781",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4672.5,\r
+        "y": 626,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "19571e12.890ec2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "19571e12.890ec2",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4830,\r
+        "y": 626,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c5003e.5a8698",\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 delete ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 4826.5,\r
+        "y": 586,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fd7fa756.f7d6e8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3790,\r
+        "y": 480,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "7d0f2c32.be1c14",\r
+                "d337892f.188d2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d0f2c32.be1c14",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4122.5,\r
+        "y": 450,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "bcce4236.8aab4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d337892f.188d2",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4127.5,\r
+        "y": 515,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "fe33b47b.c7292"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bcce4236.8aab4",\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 delete OTN tunnel rest api\" />\n",\r
+        "comments": "",\r
+        "x": 4298.5,\r
+        "y": 450,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fe33b47b.c7292",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4294,\r
+        "y": 515,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "270a4545.e66b22",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3728,\r
+        "y": 615,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "9b17a7a2.876",\r
+                "67f91d39.722cb4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "67f91d39.722cb4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3981,\r
+        "y": 593,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "10401b5c.b05865"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9b17a7a2.876",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3981,\r
+        "y": 649,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c7846e0.04a7f",\r
+        "type": "save",\r
+        "name": "delete connectivity resource in AAI",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2277,\r
+        "y": 1030,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4768fc2.d5865",\r
+        "type": "save",\r
+        "name": "delete vpn-binding resource in AAI",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3709,\r
+        "y": 731,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e7d69f06.780b38",\r
+        "type": "outcome",\r
+        "name": "uni",\r
+        "xml": "<outcome value='uni'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2642,\r
+        "y": 710,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "f282643f.862928"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f282643f.862928",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2805,\r
+        "y": 710,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "7484e145.9ae3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7484e145.9ae3a8",\r
+        "type": "save",\r
+        "name": "delete uni resource in AAI",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3048,\r
+        "y": 710,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9386fbbc.1d2048",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2087,\r
+        "y": 299,\r
+        "z": "de2a2b68.0a5d7",\r
+        "wires": [\r
+            [\r
+                "c57d1cb2.40bd38",\r
+                "9c7846e0.04a7f"\r
+            ]\r
+        ]\r
+    }\r
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
new file mode 100644 (file)
index 0000000..8f287f3
--- /dev/null
@@ -0,0 +1,1627 @@
+[\r
+    {\r
+        "id": "9eb6465b.8231d",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 174,\r
+        "y": 129,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "c7ce6b7b.48fc18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c7ce6b7b.48fc18",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 399.2856903076172,\r
+        "y": 203.23810863494873,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "5b4de938.1f507"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5b4de938.1f507",\r
+        "type": "method",\r
+        "name": "method cll-vnf-topology-operation-cll-modify",\r
+        "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 405.42860412597656,\r
+        "y": 288.0000305175781,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "4dc62efc.c83c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4dc62efc.c83c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 775.238037109375,\r
+        "y": 312.66668701171875,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "967b1057.e0a818",\r
+                "c598fe83.44b4b8",\r
+                "14de5c82.464f93"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "967b1057.e0a818",\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": 1030.571533203125,\r
+        "y": 466.59698486328125,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c598fe83.44b4b8",\r
+        "type": "save",\r
+        "name": "get service-instance from aai",\r
+        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1098,\r
+        "y": 286,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "be5a0198.1ba518",\r
+                "d9138d20.e2fc8",\r
+                "91625785.c9ff18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91625785.c9ff18",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1307,\r
+        "y": 260,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "d564baab.1e6f6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4d990b70.47f5fc",\r
+        "type": "outcome",\r
+        "name": "logical-link",\r
+        "xml": "<outcome value='logical-link'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1039.0001220703125,\r
+        "y": 766.0001220703125,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "5e1ad592.41ee24"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e1ad592.41ee24",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1216,\r
+        "y": 759,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "e398aae7.45cbf8",\r
+                "a04e6833.e4988",\r
+                "5187f08e.74ac2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d902fdae.cea3e8",\r
+        "type": "for",\r
+        "name": "for each allotted-resource relationship",\r
+        "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 814,\r
+        "y": 695,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "4648afd9.f59d38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4648afd9.f59d38",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1085,\r
+        "y": 691,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "4d990b70.47f5fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "14de5c82.464f93",\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' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1065,\r
+        "y": 226,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "aaa9891e.70ccc8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 362,\r
+        "y": 671,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "d7003a6e.38b288",\r
+                "cee9d4f6.bc12e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d7003a6e.38b288",\r
+        "type": "for",\r
+        "name": "for each allotted-resource relationship",\r
+        "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 808,\r
+        "y": 530,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "23206dde.76caa2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9cc7d8a0.338888",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1290.33349609375,\r
+        "y": 1177,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "361c81d1.d1312e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cee9d4f6.bc12e8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 781,\r
+        "y": 1176,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "80751e9a.0057d8",\r
+                "26d1ad19.58f772"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "80751e9a.0057d8",\r
+        "type": "for",\r
+        "name": "for each svc-instance relationship",\r
+        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1055,\r
+        "y": 1176,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "9cc7d8a0.338888"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "361c81d1.d1312e",\r
+        "type": "outcome",\r
+        "name": "connectivity",\r
+        "xml": "<outcome value='connectivity'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 574.000244140625,\r
+        "y": 1330,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "eead4d83.93ec08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fba02c9f.91f47",\r
+        "type": "save",\r
+        "name": "get connectivity from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 963,\r
+        "y": 1335,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "dbda7d85.ee895",\r
+                "4ef19f13.4e41a8",\r
+                "2ea82e0b.cdf21a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dbda7d85.ee895",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1159,\r
+        "y": 1300,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "8ba3755.a15c088"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ef19f13.4e41a8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1159.490966796875,\r
+        "y": 1345.5740356445312,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "729746db.d253f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2ea82e0b.cdf21a",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1124,\r
+        "y": 1391,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "4b0e29e1.6abb78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "729746db.d253f",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1319.0625,\r
+        "y": 1342.8597412109375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4b0e29e1.6abb78",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1277,\r
+        "y": 1393,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8ba3755.a15c088",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1323,\r
+        "y": 1284,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "5032e132.b50ce8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eead4d83.93ec08",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 746,\r
+        "y": 1330,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "fba02c9f.91f47",\r
+                "8f9d786c.56a8b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8f9d786c.56a8b8",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.connectivity",\r
+        "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",\r
+        "comments": "",\r
+        "x": 966,\r
+        "y": 1278,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e398aae7.45cbf8",\r
+        "type": "set",\r
+        "name": "set the current logical-link-name",\r
+        "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 1462,\r
+        "y": 669,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a04e6833.e4988",\r
+        "type": "save",\r
+        "name": "get logical-link from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1429,\r
+        "y": 783,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "49053c81.8b87cc",\r
+                "6a35a06.779ac6",\r
+                "64bb497.5849e38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49053c81.8b87cc",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1641.490966796875,\r
+        "y": 749.573974609375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "7b3cd426.944f0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a35a06.779ac6",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1630,\r
+        "y": 794,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "715fffb0.0dd628"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7b3cd426.944f0c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1790.0625,\r
+        "y": 749.8597412109375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "715fffb0.0dd628",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1789,\r
+        "y": 794,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "64bb497.5849e38",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1635,\r
+        "y": 837,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cb0d7b9d.4f62",\r
+        "type": "switchNode",\r
+        "name": "switch loglink-id exists in conn",\r
+        "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1552,\r
+        "y": 1283,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "ed843baa.4246c",\r
+                "77db6f07.dbc38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed843baa.4246c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1763,\r
+        "y": 1248,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "c41e69d5.000d98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "77db6f07.dbc38",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1760,\r
+        "y": 1309,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c41e69d5.000d98",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1915,\r
+        "y": 1249,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "b90808de.83d488"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c0a4cffa.883e98",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 2068,\r
+        "y": 1277,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1190650a.0a84cb",\r
+        "type": "comment",\r
+        "name": "currLinkIsFound. Go to the next logical-link",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2073,\r
+        "y": 1171,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5187f08e.74ac2",\r
+        "type": "switchNode",\r
+        "name": "switch currLinkIsFound",\r
+        "xml": "<switch test='`$currLinkIsFound`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1355,\r
+        "y": 901,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "bc7d7df2.5493c",\r
+                "acacd757.221108"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc7d7df2.5493c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1541,\r
+        "y": 880,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "1afa8a19.4821fe"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acacd757.221108",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1538,\r
+        "y": 1016,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1afa8a19.4821fe",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1783,\r
+        "y": 875,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "790c6016.9667b8",\r
+        "type": "comment",\r
+        "name": "A new logical-link has been found: modify process should be triggered",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1729,\r
+        "y": 979,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5032e132.b50ce8",\r
+        "type": "switchNode",\r
+        "name": "switch connectivityBW == gfp",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1553,\r
+        "y": 1374,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "ee0cb72e.3d8b4",\r
+                "b958be18.cec7a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee0cb72e.3d8b4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1758,\r
+        "y": 1370,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b958be18.cec7a8",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1760,\r
+        "y": 1420,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "649f93b2.4fa094"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "649f93b2.4fa094",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1914,\r
+        "y": 1419,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "2c6dae30.c090da",\r
+                "bec6024a.522f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b90808de.83d488",\r
+        "type": "set",\r
+        "name": "set currLinkIsFound",\r
+        "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 2101,\r
+        "y": 1221,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2c6dae30.c090da",\r
+        "type": "set",\r
+        "name": "set bwModified",\r
+        "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 2109,\r
+        "y": 1398,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bec6024a.522f",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 934,\r
+        "y": 1624,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "fa7c4190.123f5"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa7c4190.123f5",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1139,\r
+        "y": 1624,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "15fdeaff.12dc65"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15fdeaff.12dc65",\r
+        "type": "outcome",\r
+        "name": "vpn-binding",\r
+        "xml": "<outcome value='vpn-binding'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1305,\r
+        "y": 1624,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "23696373.a05af4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "23696373.a05af4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1468,\r
+        "y": 1624,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "393b763a.3c031a",\r
+                "93b6e437.4f099"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "93b6e437.4f099",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.vpn-binding",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
+        "comments": "",\r
+        "x": 1697,\r
+        "y": 1564,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "393b763a.3c031a",\r
+        "type": "save",\r
+        "name": "get vpn-binding from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1206,\r
+        "y": 1718,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "2f327191.83395e",\r
+                "e7652a9b.a6a5d8",\r
+                "cbe418b.f7d27e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a250676.10f76",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1590,\r
+        "y": 1718,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "c8600837.7048d8",\r
+                "6043cb08.7416ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2f327191.83395e",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1417,\r
+        "y": 1720,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "8a250676.10f76"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e7652a9b.a6a5d8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1417.490966796875,\r
+        "y": 1765.5740356445312,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "a94efe89.188bd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cbe418b.f7d27e8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1415,\r
+        "y": 1809,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "f4d34be9.21913"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4d34be9.21913",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1582,\r
+        "y": 1826,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a94efe89.188bd8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1580.0623779296875,\r
+        "y": 1765.8597717285156,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c8600837.7048d8",\r
+        "type": "save",\r
+        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1940.5,\r
+        "y": 1713,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6043cb08.7416ec",\r
+        "type": "save",\r
+        "name": "update connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1867.5,\r
+        "y": 1777,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "be5a0198.1ba518",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1323,\r
+        "y": 144,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "acd16415.eb51f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d9138d20.e2fc8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1318.490966796875,\r
+        "y": 213.57403564453125,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "855114bb.d4b47"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acd16415.eb51f",\r
+        "type": "switchNode",\r
+        "name": "switch allotted-resources_length != 0",\r
+        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1562,\r
+        "y": 141,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "7d32da32.7e3de4",\r
+                "7d05195c.3ec52"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "855114bb.d4b47",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1472.0623779296875,\r
+        "y": 216.85977172851562,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d564baab.1e6f6",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1476,\r
+        "y": 261,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7d32da32.7e3de4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1775,\r
+        "y": 165,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "1771a12b.55c52f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d05195c.3ec52",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1777,\r
+        "y": 105,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1771a12b.55c52f",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1720,\r
+        "y": 347,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "e4c22eb.a2aea5",\r
+                "6160b6fc.008b48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e4c22eb.a2aea5",\r
+        "type": "for",\r
+        "name": "for each allotted-resource",\r
+        "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1978,\r
+        "y": 300,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "fc0dfed8.0cac3",\r
+                "c57f71e8.93673"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6160b6fc.008b48",\r
+        "type": "set",\r
+        "name": "set tmp.arr",\r
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n<parameter name='bwModified' value='false' />\n",\r
+        "comments": "",\r
+        "x": 1937,\r
+        "y": 250,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d51caf90.a463f",\r
+        "type": "comment",\r
+        "name": "The following two nodes are for PCE",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2012,\r
+        "y": 105,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f6765cf8.85e25",\r
+        "type": "get-resource",\r
+        "name": "get-resource pnfs-list",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1972,\r
+        "y": 149,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "66aed450.169b54",\r
+        "type": "get-resource",\r
+        "name": "get-resource logical-links",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1985,\r
+        "y": 194,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c3532310.372288",\r
+        "type": "switchNode",\r
+        "name": "switch allotted-resource.relationship-list not empty",\r
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2205,\r
+        "y": 465,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "9a292ac4.9b06e",\r
+                "35630785.237e1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c57f71e8.93673",\r
+        "type": "save",\r
+        "name": "get allotted-resource from aai",\r
+        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2246,\r
+        "y": 304,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "87b192bc.e1f0e",\r
+                "d00bb928.2d4ff",\r
+                "29adfdf9.b65b62"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "87b192bc.e1f0e",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2462,\r
+        "y": 371,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "8f69272a.fd278"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d00bb928.2d4ff",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2462.490966796875,\r
+        "y": 270.573974609375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "b5f2de6e.0aa398"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "29adfdf9.b65b62",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2458,\r
+        "y": 320,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "8aece160.d46958"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b5f2de6e.0aa398",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2640.0625,\r
+        "y": 270.8597412109375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8aece160.d46958",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 2640,\r
+        "y": 320,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8f69272a.fd278",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2642,\r
+        "y": 371,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "a8018aed.5af3e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "35630785.237e1",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2526,\r
+        "y": 447,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9a292ac4.9b06e",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2508,\r
+        "y": 545,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "aaa9891e.70ccc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a8018aed.5af3e8",\r
+        "type": "save",\r
+        "name": "get allotted-resource relationship from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2935,\r
+        "y": 318,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "ee26c76e.4e13b",\r
+                "ebfa2004.002188",\r
+                "d77341f8.228578"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ebfa2004.002188",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3208.490966796875,\r
+        "y": 210.573974609375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "c12dc61.2210b38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d77341f8.228578",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3204,\r
+        "y": 260,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "bd3bae8a.af124"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee26c76e.4e13b",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3208,\r
+        "y": 311,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "de61d430.83d478"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "23206dde.76caa2",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3173,\r
+        "y": 512,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "9e627c37.4741c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fc0dfed8.0cac3",\r
+        "type": "set",\r
+        "name": "set the current allotted-resource-id",\r
+        "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 2243,\r
+        "y": 223,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c12dc61.2210b38",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3386.0625,\r
+        "y": 210.8597412109375,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bd3bae8a.af124",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 3386,\r
+        "y": 260,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "de61d430.83d478",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3388,\r
+        "y": 311,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "c3532310.372288"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e627c37.4741c8",\r
+        "type": "outcome",\r
+        "name": "network-policy",\r
+        "xml": "<outcome value='network-policy'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3364,\r
+        "y": 509,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "e7f365c6.bea78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e7f365c6.bea78",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3540.9998779296875,\r
+        "y": 501.9998779296875,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "dc98dc9c.c8fc5",\r
+                "d938d57f.cf2528"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc98dc9c.c8fc5",\r
+        "type": "set",\r
+        "name": "set the 1st network-policy-id",\r
+        "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 3783.9998779296875,\r
+        "y": 458.9998779296875,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d938d57f.cf2528",\r
+        "type": "save",\r
+        "name": "get network-policy from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3772.9998779296875,\r
+        "y": 513.9998779296875,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "21724bd7.b5773c",\r
+                "86152ffd.44c928",\r
+                "acc93ab6.b56018"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acc93ab6.b56018",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4026,\r
+        "y": 400,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "958f19ed.72cb28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "958f19ed.72cb28",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4174.571533203125,\r
+        "y": 400.2857666015625,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "34514989.26e926",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 4173.509033203125,\r
+        "y": 444.426025390625,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "86152ffd.44c928",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4014.509033203125,\r
+        "y": 444.426025390625,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "34514989.26e926"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "21724bd7.b5773c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4021.509033203125,\r
+        "y": 523.426025390625,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "9ee2f354.296c2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ee2f354.296c2",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4160.509033203125,\r
+        "y": 523.426025390625,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            [\r
+                "66fe28af.a13018",\r
+                "a2cba337.578da8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66fe28af.a13018",\r
+        "type": "set",\r
+        "name": "set the max bandwidth",\r
+        "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
+        "comments": "",\r
+        "x": 4366,\r
+        "y": 521,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a2cba337.578da8",\r
+        "type": "set",\r
+        "name": "set the max bandwidth",\r
+        "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
+        "comments": "",\r
+        "x": 4365,\r
+        "y": 567,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "26d1ad19.58f772",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 838,\r
+        "y": 2032,\r
+        "z": "7b5a733a.b08434",\r
+        "wires": [\r
+            []\r
+        ]\r
+    }\r
+]
\ No newline at end of file
index 1c85333..6248a17 100755 (executable)
@@ -296,3 +296,5 @@ GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-logic ${project.version} syn
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-connectivity ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-ROOT-conn ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-find-maximum-used-tpn ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-modify ${project.version} sync
index 111f98b..c098114 100644 (file)
                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                       key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
                                     <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
-                                    <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                    <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
                                     <parameter name='operational-status' value='Created' />
                                     <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
                                     <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
new file mode 100644 (file)
index 0000000..67cf779
--- /dev/null
@@ -0,0 +1,255 @@
+<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}'>
+    <method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--       resource="service-instance"-->
+            <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--       local-only="false"-->
+            <!--       force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--vnf-topology-operation-input.service-information.service-instance-id-->
+                <outcome value='success'>
+                    <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
+                        <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
+                            <outcome value='connectivity'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <block>
+                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                    <outcome value='vpn-binding'>
+                                                        <block atomic="true">
+                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                          resource="vpn-binding"
+                                                                          key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                          local-only="false"
+                                                                          pfx="tmp.aai.vpn-binding" >
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-binding.src-access-node-id`" />
+                                                                        </set>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="pnf"
+                                                                                      key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                            <!--AND depth = '0'"-->
+                                                                            <outcome value='success'>
+                                                                                <block>
+                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                <block atomic="true">
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
+                    depth = '1'"
+                                                                                                                  pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                        <outcome value='success'>
+                                                                                                            <block>
+                                                                                                                <set>
+                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                </set>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='Other'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <break/>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </switch>
+                                                                                    </for>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='not-found'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='Other'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                            <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
+                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                            <parameter name="format" value="json"/>
+                                                                            <parameter name="httpMethod" value="delete"/>
+                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true"></block>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                        <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                            <outcome value='Other'>
+                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                    <parameter name="format" value="json"/>
+                                                                                    <parameter name="httpMethod" value="delete"/>
+                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true"></block>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                            </outcome>
+                                                                            <outcome value=''></outcome>
+                                                                        </switch>
+                                                                        <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='not-found'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='failure'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='error-code' value='' />
+                                                                        <parameter name='error-message' value='' />
+                                                                    </return>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='uni'>
+                                                        <block atomic="true">
+                                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                    key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'></delete>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='not-found'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
+                                        </return>
+                                    </outcome>
+                                </get-resource>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                    </return>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </get-resource>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
new file mode 100644 (file)
index 0000000..7bdae76
--- /dev/null
@@ -0,0 +1,282 @@
+<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}'>
+    <method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--       resource="service-instance"-->
+            <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+            <!--       local-only="false"-->
+            <!--       force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                <!--   resource="service-instance"-->
+                <!--   key='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->
+                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+                <!--   local-only="false"-->
+                <!--   force="true" pfx="tmp.aai.service-instance">-->
+                <outcome value='success'>
+                    <switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>
+                        <outcome value='false'></outcome>
+                        <outcome value='true'>
+                            <block>
+                                <set>
+                                    <parameter name='tmp.arr' value='' />
+                                    <parameter name='tmp.arridx' value='0' />
+                                    <parameter name='tmp.arr_length' value='0' />
+                                    <parameter name='otn-tunnel-slice' value='' />
+                                    <parameter name='otn-tunnel-slice_length' value='0' />
+                                    <!--<parameter name='tmp.slicevpns' value='' />-->
+                                    <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
+                                    <parameter name='bwModified' value='false' />
+                                </set>
+                                <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <set>
+                                        <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
+                                    </set>
+                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                    <!--       resource="allotted-resource"-->
+                                    <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                    <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                    <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                    <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                    <!--       local-only="false"-->
+                                    <!--       force="true" pfx="tmp.aai.allotted-resource">-->
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="allotted-resource"
+                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                                  local-only="false"
+                                                  force="true" pfx="tmp.aai.allotted-resource">
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="allotted-resource:relationship-list"
+                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND allotted-resource.id = $allotted-resource-id'
+                                                              local-only="false"
+                                                              force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value='' />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                                <outcome value='false'></outcome>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='network-policy'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="network-policy"
+                                                                                                      key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.network-policy">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                        <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                        <block atomic='true'>
+                                                                            <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
+                                                                                <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
+                                                                                    <outcome value='connectivity'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.aai.connectivity.' value='' />
+                                                                                            </set>
+                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                          resource="connectivity"
+                                                                                                          key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                                                                                          local-only="false"
+                                                                                                          pfx="tmp.aai.connectivity" >
+                                                                                                <outcome value='success'>
+                                                                                                    <block atomic="true">
+                                                                                                        <switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>
+                                                                                                            <outcome value='true'></outcome>
+                                                                                                            <outcome value='false'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <set>
+                                                                                                                        <parameter name='bwModified' value="true" />
+                                                                                                                    </set>
+                                                                                                                    <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                                                                        <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                                                                            <outcome value='vpn-binding'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                                                                                    </set>
+                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                  resource="vpn-binding"
+                                                                                                                                                  key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                                                                                  local-only="false"
+                                                                                                                                                  pfx="tmp.aai.vpn-binding" >
+                                                                                                                                        <outcome value='success'>
+                                                                                                                                            <block atomic="true">
+                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                </update>
+                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                                                                                                                    <parameter name='cir' value='`$gfp *1000000`' />
+                                                                                                                                                    <parameter name='eir' value='`$gfp *1000000`' />
+                                                                                                                                                </update>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='failure'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                <parameter name='error-message' value='' />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                    </get-resource>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </for>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </switch>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                                <outcome value='not-found'>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                    </return>
+                                                                                                </outcome>
+                                                                                                <outcome value='failure'>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='error-code' value='' />
+                                                                                                        <parameter name='error-message' value='' />
+                                                                                                    </return>
+                                                                                                </outcome>
+                                                                                            </get-resource>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </for>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                                                                        </block>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </get-resource>
+                                </for>
+                            </block>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                    </return>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </get-resource>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file