X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json;h=47e80d28196f2c5af534549d0958e939bd4fd111;hb=2b6f24fe23ac60d0d9cf885687bf9786bc521ec1;hp=6585de840ecd5c775ce0c5d366c05da81b628400;hpb=c699c69f8503356016cb1066ad38ec2771eeebd6;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index 6585de84..47e80d28 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "df3491bc.625428",
+        "id": "b3b9455c.251fb8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 128,
-        "y": 113,
-        "z": "b31344e1.6b9228",
+        "x": 107,
+        "y": 110,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f93a4fe6.087538"
+                "5661f4c7.6e8104"
             ]
         ]
     },
     {
-        "id": "f93a4fe6.087538",
+        "id": "5661f4c7.6e8104",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,4818 +22,4939 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 412.2856903076172,
-        "y": 174.23810863494873,
-        "z": "b31344e1.6b9228",
+        "x": 391.2856903076172,
+        "y": 171.23810863494873,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3a78d95d.5e3c5e"
+                "47f23ec8.713ca"
             ]
         ]
     },
     {
-        "id": "3a78d95d.5e3c5e",
+        "id": "47f23ec8.713ca",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 418.42860412597656,
-        "y": 259.0000305175781,
-        "z": "b31344e1.6b9228",
+        "x": 397.42860412597656,
+        "y": 256.0000305175781,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "35ecb5b7.3f1b02"
+                "909d5d01.2efc9"
             ]
         ]
     },
     {
-        "id": "35ecb5b7.3f1b02",
+        "id": "909d5d01.2efc9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 788.238037109375,
-        "y": 283.66668701171875,
-        "z": "b31344e1.6b9228",
+        "x": 767.238037109375,
+        "y": 280.66668701171875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a99ea7b2.f5e618",
-                "183025fe.418fa2",
-                "d352d101.d008a8"
+                "c5df95a2.6c697",
+                "a851f151.681188",
+                "4430b278.87d9ac"
             ]
         ]
     },
     {
-        "id": "a99ea7b2.f5e618",
+        "id": "c5df95a2.6c697",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1089.571533203125,
-        "y": 554.5969848632812,
-        "z": "b31344e1.6b9228",
+        "x": 1068.571533203125,
+        "y": 551.5969848632812,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "183025fe.418fa2",
+        "id": "a851f151.681188",
         "type": "save",
         "name": "get service-instance from aai",
         "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\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1111,
-        "y": 257,
-        "z": "b31344e1.6b9228",
+        "x": 1090,
+        "y": 254,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "47f816cc.c0286",
-                "318d2442.efdd34",
-                "4265fd48.9eb024"
+                "bee2d1fb.fc819",
+                "706fc8bb.926d88",
+                "b5dbfca1.6b8958"
             ]
         ]
     },
     {
-        "id": "47f816cc.c0286",
+        "id": "bee2d1fb.fc819",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 115,
-        "z": "b31344e1.6b9228",
+        "x": 1315,
+        "y": 112,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6fd78e9c.961b2"
+                "e14cb882.1a5158"
             ]
         ]
     },
     {
-        "id": "318d2442.efdd34",
+        "id": "706fc8bb.926d88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331.490966796875,
-        "y": 184.57403564453125,
-        "z": "b31344e1.6b9228",
+        "x": 1310.490966796875,
+        "y": 181.57403564453125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "aa8b68cf.4936c"
+                "5cbb540f.81c364"
             ]
         ]
     },
     {
-        "id": "4265fd48.9eb024",
+        "id": "b5dbfca1.6b8958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 1299,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ea9381a6.8a9938"
+                "bd99daf8.5c5508"
             ]
         ]
     },
     {
-        "id": "6fd78e9c.961b2",
+        "id": "e14cb882.1a5158",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575,
-        "y": 112,
-        "z": "b31344e1.6b9228",
+        "x": 1554,
+        "y": 109,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a9515923.c68db8",
-                "3b6a0136.f8dee6"
+                "6386b942.401658",
+                "736cbc7f.84dcc4"
             ]
         ]
     },
     {
-        "id": "aa8b68cf.4936c",
+        "id": "5cbb540f.81c364",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1485.0623779296875,
-        "y": 187.85977172851562,
-        "z": "b31344e1.6b9228",
+        "x": 1464.0623779296875,
+        "y": 184.85977172851562,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ea9381a6.8a9938",
+        "id": "bd99daf8.5c5508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1489,
-        "y": 232,
-        "z": "b31344e1.6b9228",
+        "x": 1468,
+        "y": 229,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a9515923.c68db8",
+        "id": "6386b942.401658",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788,
-        "y": 136,
-        "z": "b31344e1.6b9228",
+        "x": 1767,
+        "y": 133,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8d77a4c9.47348"
+                "bdbad755.d12dc8"
             ]
         ]
     },
     {
-        "id": "3b6a0136.f8dee6",
+        "id": "736cbc7f.84dcc4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1790,
-        "y": 76,
-        "z": "b31344e1.6b9228",
+        "x": 1769,
+        "y": 73,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b9472b2.e91dbe",
+        "id": "73516434.8b694c",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1090,
-        "y": 145,
-        "z": "b31344e1.6b9228",
+        "x": 1069,
+        "y": 142,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8d77a4c9.47348",
+        "id": "bdbad755.d12dc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1773,
-        "y": 224,
-        "z": "b31344e1.6b9228",
+        "x": 1752,
+        "y": 221,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2dfd81e1.a251ae",
-                "d0adb7e4.435f98",
-                "bf30e0be.23b998",
-                "bc1d9c19.8a817"
+                "3b75dc28.79bec4",
+                "5d2f9da2.d38694",
+                "48979781.1681f8",
+                "93c183ce.0a9ed8",
+                "5d8a5506.b8ac8c",
+                "a26db7da.175a4"
             ]
         ]
     },
     {
-        "id": "4b515bec.7b07fc",
+        "id": "31cf85b5.906fca",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",
         "comments": "",
-        "x": 2636,
-        "y": 824,
-        "z": "b31344e1.6b9228",
+        "x": 2615,
+        "y": 821,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1fb3da4d.f9823e",
+        "id": "db907b5a.2ae538",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2637,
-        "y": 879,
-        "z": "b31344e1.6b9228",
+        "x": 2616,
+        "y": 876,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1fed210d.6adb97",
+        "id": "fea2a65.c94cf58",
         "type": "save",
         "name": "get allotted-resource from aai",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2259,
-        "y": 275,
-        "z": "b31344e1.6b9228",
+        "x": 2238,
+        "y": 272,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1d390c60.f37264",
-                "828d1344.2eeb18",
-                "35c0fff4.63034"
+                "87df4589.584858",
+                "635af784.3cb32",
+                "22a4a39b.dd73ec"
             ]
         ]
     },
     {
-        "id": "1d390c60.f37264",
+        "id": "87df4589.584858",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2454,
+        "y": 339,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1dfc0585.305702"
+                "8e0be879.699538"
             ]
         ]
     },
     {
-        "id": "828d1344.2eeb18",
+        "id": "635af784.3cb32",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475.490966796875,
-        "y": 241.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2454.490966796875,
+        "y": 238.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "899f4256.fc61"
+                "84ac682e.b78a08"
             ]
         ]
     },
     {
-        "id": "35c0fff4.63034",
+        "id": "22a4a39b.dd73ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2450,
+        "y": 288,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5b10d117.cfe6d8"
+                "b2061dbc.0548c8"
             ]
         ]
     },
     {
-        "id": "899f4256.fc61",
+        "id": "84ac682e.b78a08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2653.0625,
-        "y": 241.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2632.0625,
+        "y": 238.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5b10d117.cfe6d8",
+        "id": "b2061dbc.0548c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2653,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2632,
+        "y": 288,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e459bf6d.9da9d8",
+        "id": "358e179e.99b9f",
         "type": "save",
         "name": "get logical-link from aai",
         "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\">",
         "comments": "",
         "outputs": 1,
-        "x": 1994,
-        "y": 764,
-        "z": "b31344e1.6b9228",
+        "x": 1973,
+        "y": 761,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f5d3816e.ab2828",
-                "4956f23f.0bb47c",
-                "fe0f59f6.d97868"
+                "e260aa07.d4c01",
+                "9ec9d813.5ed0f",
+                "46b462c7.130bb4"
             ]
         ]
     },
     {
-        "id": "f5d3816e.ab2828",
+        "id": "e260aa07.d4c01",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.490966796875,
-        "y": 742.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2264.490966796875,
+        "y": 739.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9822556a.f611a"
+                "c2b6bbd8.3d5eb8"
             ]
         ]
     },
     {
-        "id": "4956f23f.0bb47c",
+        "id": "9ec9d813.5ed0f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2274,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2253,
+        "y": 784,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6c100a4d.9d821c"
+                "1e57c51f.2af7db"
             ]
         ]
     },
     {
-        "id": "9822556a.f611a",
+        "id": "c2b6bbd8.3d5eb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2434.0625,
-        "y": 742.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2413.0625,
+        "y": 739.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6c100a4d.9d821c",
+        "id": "1e57c51f.2af7db",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2433,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2412,
+        "y": 784,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fe0f59f6.d97868",
+        "id": "46b462c7.130bb4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2281,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2260,
+        "y": 863,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6d1afb47.ab3814"
+                "9b6c334b.ffcfb8"
             ]
         ]
     },
     {
-        "id": "6d1afb47.ab3814",
+        "id": "9b6c334b.ffcfb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2420,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2399,
+        "y": 863,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4b515bec.7b07fc",
-                "1fb3da4d.f9823e",
-                "97eccb48.84f6c",
-                "c57ab47a.d333d8",
-                "10cbf4f3.49fe3b",
-                "49d3005f.62282",
-                "1f03402a.5db7",
-                "56710693.e24068",
-                "84b0870f.4db1e",
-                "3323f682.f60c3a",
-                "13ac3dbd.1f366a"
+                "31cf85b5.906fca",
+                "db907b5a.2ae538",
+                "b99c062f.cc8e2",
+                "f8919e28.817698",
+                "63c0978f.6d4218",
+                "256b3f1a.6b05f8",
+                "72dba682.c63c9",
+                "1b6d1c66.bc0bb4",
+                "d6aa9ec.33fa46",
+                "6c32ab13.072304",
+                "35f98555.2ceed2",
+                "63cf541.20dacac"
             ]
         ]
     },
     {
-        "id": "97eccb48.84f6c",
+        "id": "b99c062f.cc8e2",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2649,
-        "y": 947,
-        "z": "b31344e1.6b9228",
+        "x": 2628,
+        "y": 944,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8c8a4891.ac867",
-                "8506ad3d.b7e4c",
-                "a3b6635c.c539f8"
+                "177d33ef.653acc",
+                "b808d106.b2a7e8",
+                "99bf3e88.29ecb8"
             ]
         ]
     },
     {
-        "id": "c57ab47a.d333d8",
+        "id": "f8919e28.817698",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2628,
-        "y": 1548.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2607,
+        "y": 1545.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "506562cd.b8f74c",
-                "8d73f82f.8988f8",
-                "24728d1d.df92ba"
+                "e551771e.c49a78",
+                "c096bcbd.1a977",
+                "cd719142.8f5fd8"
             ]
         ]
     },
     {
-        "id": "8c8a4891.ac867",
+        "id": "177d33ef.653acc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850,
-        "y": 831,
-        "z": "b31344e1.6b9228",
+        "x": 2829,
+        "y": 828,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "40f9d3c1.86e1ec"
+                "60c8d868.cb0f38"
             ]
         ]
     },
     {
-        "id": "8506ad3d.b7e4c",
+        "id": "b808d106.b2a7e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2845.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2824.509033203125,
+        "y": 877.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6f975963.47cb7"
+                "8912eaa6.91a52"
             ]
         ]
     },
     {
-        "id": "a3b6635c.c539f8",
+        "id": "99bf3e88.29ecb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2849.509033203125,
-        "y": 931.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2828.509033203125,
+        "y": 928.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "61bb235e.2775f4"
+                "f8cee9a2.f0a618"
             ]
         ]
     },
     {
-        "id": "40f9d3c1.86e1ec",
+        "id": "60c8d868.cb0f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2998.571533203125,
-        "y": 830.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 2977.571533203125,
+        "y": 827.2857666015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6f975963.47cb7",
+        "id": "8912eaa6.91a52",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2988.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2967.509033203125,
+        "y": 877.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "506562cd.b8f74c",
+        "id": "e551771e.c49a78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2851,
-        "y": 1518.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2830,
+        "y": 1515.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7f769faa.864248"
+                "ae022a7b.5f0fc"
             ]
         ]
     },
     {
-        "id": "8d73f82f.8988f8",
+        "id": "c096bcbd.1a977",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2846.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2825.509033203125,
+        "y": 1565.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cc9ee8f2.77fda8"
+                "2c76b27.1b72ace"
             ]
         ]
     },
     {
-        "id": "24728d1d.df92ba",
+        "id": "cd719142.8f5fd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850.509033203125,
-        "y": 1619.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2829.509033203125,
+        "y": 1616.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8a29f509.d58fe8"
+                "e3f74bb4.409b5"
             ]
         ]
     },
     {
-        "id": "7f769faa.864248",
+        "id": "ae022a7b.5f0fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2999.571533203125,
-        "y": 1518.28564453125,
-        "z": "b31344e1.6b9228",
+        "x": 2978.571533203125,
+        "y": 1515.28564453125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "cc9ee8f2.77fda8",
+        "id": "2c76b27.1b72ace",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2989.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2968.509033203125,
+        "y": 1565.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b720785b.7c7",
+        "id": "194cc348.04e4bd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3663.66650390625,
-        "y": 975,
-        "z": "b31344e1.6b9228",
+        "x": 3642.66650390625,
+        "y": 972,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f3775fbc.163688",
-                "77e2870c.e28a38",
-                "ac8bf04e.ff247",
-                "7c2c78d5.f4945",
-                "bb95643a.1dafd8"
+                "e0f54a30.b97458",
+                "6e8fe0e8.771d7",
+                "2d7aee5e.4b3492",
+                "d2697672.e5142",
+                "c6965465.aeb14"
             ]
         ]
     },
     {
-        "id": "669f51ab.4dcf7",
+        "id": "c1db8d6e.967fa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3491,
-        "y": 976,
-        "z": "b31344e1.6b9228",
+        "x": 3470,
+        "y": 973,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b720785b.7c7"
+                "194cc348.04e4bd"
             ]
         ]
     },
     {
-        "id": "bfa60b88.954ac8",
+        "id": "ea169f9.1e78f6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3500.490966796875,
-        "y": 1018.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3479.490966796875,
+        "y": 1015.5740356445312,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f78f70ff.0f2c38"
+                "9dbcf7c3.d03228"
             ]
         ]
     },
     {
-        "id": "83a912b8.5c33b",
+        "id": "b37256ee.6a59a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3489,
-        "y": 1065,
-        "z": "b31344e1.6b9228",
+        "x": 3468,
+        "y": 1062,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d7142401.9476c"
+                "78909f5b.c256b8"
             ]
         ]
     },
     {
-        "id": "f78f70ff.0f2c38",
+        "id": "9dbcf7c3.d03228",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3654.0623779296875,
-        "y": 1021.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3633.0623779296875,
+        "y": 1018.8597717285156,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d7142401.9476c",
+        "id": "78909f5b.c256b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3658,
-        "y": 1066,
-        "z": "b31344e1.6b9228",
+        "x": 3637,
+        "y": 1063,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "61bb235e.2775f4",
+        "id": "f8cee9a2.f0a618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3011,
-        "y": 933,
-        "z": "b31344e1.6b9228",
+        "x": 2990,
+        "y": 930,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4914fb6.031ad84",
-                "4835023e.e8e8cc"
+                "bd63f21f.6d97a",
+                "bcdc8dc3.72d61"
             ]
         ]
     },
     {
-        "id": "8a29f509.d58fe8",
+        "id": "e3f74bb4.409b5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3001,
-        "y": 1620.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2980,
+        "y": 1617.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33a198b5.ec1ae",
-                "684cf1ab.a79f48"
+                "d9529ce2.4ca64",
+                "68b3ff1a.0849f"
             ]
         ]
     },
     {
-        "id": "d9ace0a0.b4a76",
+        "id": "1bc4a1b0.e8f4e6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3631.66650390625,
-        "y": 1811,
-        "z": "b31344e1.6b9228",
+        "x": 3610.66650390625,
+        "y": 1808,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a2003991.03fd4",
-                "52dfb8b2.652278",
-                "22f952b9.882086",
-                "eb4dde28.2b2138",
-                "60f3b421.08732c"
+                "6b02eeb7.bc53e8",
+                "aa3dffa0.a80a58",
+                "ce63ac06.8bd44",
+                "c950727d.3e1368",
+                "83539382.7676b8"
             ]
         ]
     },
     {
-        "id": "cc45c64e.73066",
+        "id": "206889a2.ad62d6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3459,
-        "y": 1812,
-        "z": "b31344e1.6b9228",
+        "x": 3438,
+        "y": 1809,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d9ace0a0.b4a76"
+                "1bc4a1b0.e8f4e6"
             ]
         ]
     },
     {
-        "id": "33759aa.996c566",
+        "id": "eceddf53.8343c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.490966796875,
-        "y": 1854.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3447.490966796875,
+        "y": 1851.5740356445312,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "28b2902a.f0c46"
+                "89316d2b.d76a7"
             ]
         ]
     },
     {
-        "id": "fff61c46.59cf58",
+        "id": "9f6e2dae.f13bd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3457,
-        "y": 1901,
-        "z": "b31344e1.6b9228",
+        "x": 3436,
+        "y": 1898,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c4e6ae73.bdead"
+                "ff7b6926.fc1f5"
             ]
         ]
     },
     {
-        "id": "28b2902a.f0c46",
+        "id": "89316d2b.d76a7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3622.0623779296875,
-        "y": 1857.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3601.0623779296875,
+        "y": 1854.8597717285156,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c4e6ae73.bdead",
+        "id": "ff7b6926.fc1f5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3626,
-        "y": 1902,
-        "z": "b31344e1.6b9228",
+        "x": 3605,
+        "y": 1899,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "f3775fbc.163688",
+        "id": "e0f54a30.b97458",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3928,
-        "y": 959,
-        "z": "b31344e1.6b9228",
+        "x": 3907,
+        "y": 956,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "17df8b10.734cad",
-                "e9e72181.7c2d78"
+                "8a48ffc4.99708",
+                "9768c48e.e91b5"
             ]
         ]
     },
     {
-        "id": "e9e72181.7c2d78",
+        "id": "9768c48e.e91b5",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151,
-        "y": 914,
-        "z": "b31344e1.6b9228",
+        "x": 4130,
+        "y": 911,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c8b8d5f9.b22ca8"
+                "704965d2.1b9644"
             ]
         ]
     },
     {
-        "id": "17df8b10.734cad",
+        "id": "8a48ffc4.99708",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4153,
-        "y": 978,
-        "z": "b31344e1.6b9228",
+        "x": 4132,
+        "y": 975,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "59177303.95ce1c"
+                "5140e6b9.7a9158"
             ]
         ]
     },
     {
-        "id": "e95ea736.29045",
+        "id": "b8a9d793.4e0ca",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4486,
-        "y": 869,
-        "z": "b31344e1.6b9228",
+        "x": 4465,
+        "y": 866,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "59177303.95ce1c",
+        "id": "5140e6b9.7a9158",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4315,
-        "y": 974,
-        "z": "b31344e1.6b9228",
+        "x": 4294,
+        "y": 971,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c8b8d5f9.b22ca8",
+        "id": "704965d2.1b9644",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316,
-        "y": 911,
-        "z": "b31344e1.6b9228",
+        "x": 4295,
+        "y": 908,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f09148e0.5a878",
-                "e95ea736.29045"
+                "c30e1911.559b98",
+                "b8a9d793.4e0ca"
             ]
         ]
     },
     {
-        "id": "f09148e0.5a878",
+        "id": "c30e1911.559b98",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4487,
-        "y": 977,
-        "z": "b31344e1.6b9228",
+        "x": 4466,
+        "y": 974,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2c408fec.1a81a",
+        "id": "6b71df66.ebc0e",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4488,
-        "y": 926,
-        "z": "b31344e1.6b9228",
+        "x": 4467,
+        "y": 923,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ac8bf04e.ff247",
+        "id": "2d7aee5e.4b3492",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-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='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 3930,
-        "y": 1118,
-        "z": "b31344e1.6b9228",
+        "x": 3909,
+        "y": 1115,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "77e2870c.e28a38",
+        "id": "6e8fe0e8.771d7",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3975,
-        "y": 1028,
-        "z": "b31344e1.6b9228",
+        "x": 3954,
+        "y": 1025,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "936488c4.d6b8e",
+        "id": "703a6ba5.55da1c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3864,
-        "y": 1069,
-        "z": "b31344e1.6b9228",
+        "x": 3843,
+        "y": 1066,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a2003991.03fd4",
+        "id": "6b02eeb7.bc53e8",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3918,
-        "y": 1815.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3897,
+        "y": 1812.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f2d8cb03.1eed48",
-                "6e32cf18.31944"
+                "866b6a8.23d5e98",
+                "cb5f1ada.6b67f"
             ]
         ]
     },
     {
-        "id": "6e32cf18.31944",
+        "id": "cb5f1ada.6b67f",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141,
-        "y": 1770.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4120,
+        "y": 1767.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "201ffc86.8db20c"
+                "e1a14a86.388a08"
             ]
         ]
     },
     {
-        "id": "f2d8cb03.1eed48",
+        "id": "866b6a8.23d5e98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143,
-        "y": 1834.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4122,
+        "y": 1831.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b29b2d4c.c3046"
+                "e3367ed2.f52b78"
             ]
         ]
     },
     {
-        "id": "2386e717.060b18",
+        "id": "c05c0482.6a0aa8",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4476,
-        "y": 1728.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4455,
+        "y": 1725.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b29b2d4c.c3046",
+        "id": "e3367ed2.f52b78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4302,
-        "y": 1853.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4281,
+        "y": 1850.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "201ffc86.8db20c",
+        "id": "e1a14a86.388a08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4306,
-        "y": 1767.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4285,
+        "y": 1764.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2386e717.060b18",
-                "c71df80d.cfbb08"
+                "c05c0482.6a0aa8",
+                "6625860d.59cf58"
             ]
         ]
     },
     {
-        "id": "c71df80d.cfbb08",
+        "id": "6625860d.59cf58",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4477,
-        "y": 1833.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4456,
+        "y": 1830.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e385afea.eec45",
+        "id": "3d78f64a.35443a",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4472,
-        "y": 1782.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4451,
+        "y": 1779.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "22f952b9.882086",
+        "id": "ce63ac06.8bd44",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-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='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 3920,
-        "y": 1974.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3899,
+        "y": 1971.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "52dfb8b2.652278",
+        "id": "aa3dffa0.a80a58",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965,
-        "y": 1884.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3944,
+        "y": 1881.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4961c905.9d4bb",
+        "id": "de57e045.5d324",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3854,
-        "y": 1922.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3833,
+        "y": 1919.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "10cbf4f3.49fe3b",
+        "id": "63c0978f.6d4218",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2846,
-        "y": 2389,
-        "z": "b31344e1.6b9228",
+        "x": 2825,
+        "y": 2386,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "49d3005f.62282",
+        "id": "256b3f1a.6b05f8",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2644,
-        "y": 2268,
-        "z": "b31344e1.6b9228",
+        "x": 2623,
+        "y": 2265,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9f05df83.0d8378",
+        "id": "8870d8f4.24b26",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2610,
-        "y": 2202,
-        "z": "b31344e1.6b9228",
+        "x": 2589,
+        "y": 2199,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7c2c78d5.f4945",
+        "id": "d2697672.e5142",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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-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`\" />\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`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4058,
-        "y": 1166,
-        "z": "b31344e1.6b9228",
+        "x": 4037,
+        "y": 1163,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb4dde28.2b2138",
+        "id": "c950727d.3e1368",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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/' + $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`\" />\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`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 2039.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4026,
+        "y": 2036.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d08c6.2cc1e73a",
+        "id": "2cb22463.a9a10c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5102,
-        "y": 686,
-        "z": "b31344e1.6b9228",
+        "x": 5081,
+        "y": 683,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fe7f5526.b757d",
-                "ace94fc7.113e6",
-                "42739782.dc6168"
+                "4afa0297.0e92ec",
+                "f0a2c2cf.76f7c",
+                "78f72703.090dd8"
             ]
         ]
     },
     {
-        "id": "1dfc0585.305702",
+        "id": "8e0be879.699538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2655,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2634,
+        "y": 339,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8622621b.5191"
+                "c6b29f32.96c43"
             ]
         ]
     },
     {
-        "id": "7de95d04.4c5e84",
+        "id": "926dbaa7.515a7",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.0001220703125,
-        "y": 759.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 1564.0001220703125,
+        "y": 756.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "38efe599.5c2462"
+                "aa0dd611.39e8d8"
             ]
         ]
     },
     {
-        "id": "a0ff94f7.a05cd8",
+        "id": "3fd9bf5c.04e708",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2323,
-        "y": 465,
-        "z": "b31344e1.6b9228",
+        "x": 2302,
+        "y": 462,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8055d128.93cf8",
-                "a4e55956.340f1"
+                "2b043a11.143596",
+                "d91f0f1e.b29778"
             ]
         ]
     },
     {
-        "id": "a4e55956.340f1",
+        "id": "d91f0f1e.b29778",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2633,
-        "y": 472,
-        "z": "b31344e1.6b9228",
+        "x": 2612,
+        "y": 469,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8055d128.93cf8",
+        "id": "2b043a11.143596",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2632,
-        "y": 526,
-        "z": "b31344e1.6b9228",
+        "x": 2611,
+        "y": 523,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33bd7ebe.34c502"
+                "53404fc0.a38be"
             ]
         ]
     },
     {
-        "id": "2ecd1033.1e79d8",
+        "id": "dd4dd108.7ed66",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 2005,
-        "y": 709,
-        "z": "b31344e1.6b9228",
+        "x": 1984,
+        "y": 706,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "38efe599.5c2462",
+        "id": "aa0dd611.39e8d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1762,
-        "y": 752,
-        "z": "b31344e1.6b9228",
+        "x": 1741,
+        "y": 749,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2ecd1033.1e79d8",
-                "e459bf6d.9da9d8"
+                "dd4dd108.7ed66",
+                "358e179e.99b9f"
             ]
         ]
     },
     {
-        "id": "f61b9c.2378ec68",
+        "id": "50481ed8.b97c38",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3191,
-        "y": 938,
-        "z": "b31344e1.6b9228",
+        "x": 3170,
+        "y": 935,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "4914fb6.031ad84",
+        "id": "bd63f21f.6d97a",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3234,
-        "y": 1003,
-        "z": "b31344e1.6b9228",
+        "x": 3213,
+        "y": 1000,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "669f51ab.4dcf7",
-                "bfa60b88.954ac8",
-                "83a912b8.5c33b"
+                "c1db8d6e.967fa8",
+                "ea169f9.1e78f6",
+                "b37256ee.6a59a"
             ]
         ]
     },
     {
-        "id": "33a198b5.ec1ae",
+        "id": "d9529ce2.4ca64",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3231,
-        "y": 1847,
-        "z": "b31344e1.6b9228",
+        "x": 3210,
+        "y": 1844,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cc45c64e.73066",
-                "33759aa.996c566",
-                "fff61c46.59cf58"
+                "206889a2.ad62d6",
+                "eceddf53.8343c8",
+                "9f6e2dae.f13bd8"
             ]
         ]
     },
     {
-        "id": "13eb2671.9e12f2",
+        "id": "2cacaea3.bdcdca",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3192,
-        "y": 1791,
-        "z": "b31344e1.6b9228",
+        "x": 3171,
+        "y": 1788,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8622621b.5191",
+        "id": "c6b29f32.96c43",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2948,
-        "y": 289,
-        "z": "b31344e1.6b9228",
+        "x": 2927,
+        "y": 286,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "774c27b3.d5b958",
-                "314f18ee.d0e28",
-                "177a6858.e45f48"
+                "9de6915b.b19d38",
+                "e8ebc1b6.d4d34",
+                "e6a28fa6.880708"
             ]
         ]
     },
     {
-        "id": "314f18ee.d0e28",
+        "id": "e8ebc1b6.d4d34",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221.490966796875,
-        "y": 181.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 3200.490966796875,
+        "y": 178.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bf0d979c.0d6a2"
+                "b49d6ada.3dcaf8"
             ]
         ]
     },
     {
-        "id": "bf0d979c.0d6a2",
+        "id": "b49d6ada.3dcaf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3399.0625,
-        "y": 181.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 3378.0625,
+        "y": 178.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "177a6858.e45f48",
+        "id": "e6a28fa6.880708",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3217,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3196,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "69e0c103.73f7e"
+                "d8c17b5e.5b6d48"
             ]
         ]
     },
     {
-        "id": "69e0c103.73f7e",
+        "id": "d8c17b5e.5b6d48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3399,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3378,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "774c27b3.d5b958",
+        "id": "9de6915b.b19d38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3200,
+        "y": 279,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8d4f11e6.7da04"
+                "54518182.0b0878"
             ]
         ]
     },
     {
-        "id": "8d4f11e6.7da04",
+        "id": "54518182.0b0878",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3401,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3380,
+        "y": 279,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a0ff94f7.a05cd8"
+                "3fd9bf5c.04e708"
             ]
         ]
     },
     {
-        "id": "fe8ff063.6863b8",
+        "id": "62e6aba8.2c101c",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2892,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 2871,
+        "y": 503,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7f3884a8.055b2c"
+                "ce3eb436.d43a6"
             ]
         ]
     },
     {
-        "id": "7f3884a8.055b2c",
+        "id": "ce3eb436.d43a6",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3172,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 3151,
+        "y": 503,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7de95d04.4c5e84"
+                "926dbaa7.515a7"
             ]
         ]
     },
     {
-        "id": "5050eb58.e00ed4",
+        "id": "7737916f.9448f",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3377,
-        "y": 480,
-        "z": "b31344e1.6b9228",
+        "x": 3356,
+        "y": 477,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9ce29b77.ad6fe8"
+                "9c3216ab.adc2a8"
             ]
         ]
     },
     {
-        "id": "9ce29b77.ad6fe8",
+        "id": "9c3216ab.adc2a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3553.9998779296875,
-        "y": 472.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3532.9998779296875,
+        "y": 469.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e7ee0b09.87c5d8",
-                "7fe89152.e612e8"
+                "6ca4307d.28f77",
+                "15dd1089.866707"
             ]
         ]
     },
     {
-        "id": "e7ee0b09.87c5d8",
+        "id": "6ca4307d.28f77",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "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",
         "comments": "",
-        "x": 3796.9998779296875,
-        "y": 429.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3775.9998779296875,
+        "y": 426.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7fe89152.e612e8",
+        "id": "15dd1089.866707",
         "type": "save",
         "name": "get network-policy from aai",
         "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\">",
         "comments": "",
         "outputs": 1,
-        "x": 3785.9998779296875,
-        "y": 484.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3764.9998779296875,
+        "y": 481.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "64fb2208.a0a974",
-                "c3b9f4d3.aab1b8",
-                "f6aa84f.18621f8"
+                "af36166d.ada238",
+                "d07a4cd5.ac3678",
+                "65922e69.a77b18"
             ]
         ]
     },
     {
-        "id": "f6aa84f.18621f8",
+        "id": "65922e69.a77b18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4039,
-        "y": 371,
-        "z": "b31344e1.6b9228",
+        "x": 4018,
+        "y": 368,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c20366f5.78311"
+                "1424d407.3a5b34"
             ]
         ]
     },
     {
-        "id": "c20366f5.78311",
+        "id": "1424d407.3a5b34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4187.571533203125,
-        "y": 371.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 4166.571533203125,
+        "y": 368.2857666015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a9aadb9.f22de28",
+        "id": "e640c3b9.1f16d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4186.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4165.509033203125,
+        "y": 412.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c3b9f4d3.aab1b8",
+        "id": "d07a4cd5.ac3678",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4006.509033203125,
+        "y": 412.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a9aadb9.f22de28"
+                "e640c3b9.1f16d"
             ]
         ]
     },
     {
-        "id": "64fb2208.a0a974",
+        "id": "af36166d.ada238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4034.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4013.509033203125,
+        "y": 491.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7a83723d.cc96f4"
+                "3b605de0.ec3a52"
             ]
         ]
     },
     {
-        "id": "7a83723d.cc96f4",
+        "id": "3b605de0.ec3a52",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4173.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4152.509033203125,
+        "y": 491.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1f8d33e3.a771dc",
-                "420f3616.2f701"
+                "e719047d.96b1f",
+                "36ea936c.0d2d9c"
             ]
         ]
     },
     {
-        "id": "1f8d33e3.a771dc",
+        "id": "e719047d.96b1f",
         "type": "set",
         "name": "set the max bandwidth",
         "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",
         "comments": "",
-        "x": 4379,
-        "y": 492,
-        "z": "b31344e1.6b9228",
+        "x": 4358,
+        "y": 489,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "4835023e.e8e8cc",
+        "id": "bcdc8dc3.72d61",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3235,
-        "y": 673,
-        "z": "b31344e1.6b9228",
+        "x": 3214,
+        "y": 670,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "eafc912d.cb0fe",
-                "14b2df73.02d4e1"
+                "88359d7a.204d2",
+                "184f5811.e1748"
             ]
         ]
     },
     {
-        "id": "14b2df73.02d4e1",
+        "id": "184f5811.e1748",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458,
-        "y": 659,
-        "z": "b31344e1.6b9228",
+        "x": 3437,
+        "y": 656,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bb352d17.34137"
+                "65b8cca9.2ac444"
             ]
         ]
     },
     {
-        "id": "eafc912d.cb0fe",
+        "id": "88359d7a.204d2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3460,
-        "y": 692,
-        "z": "b31344e1.6b9228",
+        "x": 3439,
+        "y": 689,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4040c9e2.8e3008"
+                "776eb0a5.2fd87"
             ]
         ]
     },
     {
-        "id": "4040c9e2.8e3008",
+        "id": "776eb0a5.2fd87",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3603,
-        "y": 689,
-        "z": "b31344e1.6b9228",
+        "x": 3582,
+        "y": 686,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bb352d17.34137",
+        "id": "65b8cca9.2ac444",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3606,
-        "y": 652,
-        "z": "b31344e1.6b9228",
+        "x": 3585,
+        "y": 649,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8f0d5ee9.6635d",
-                "300f312a.b253d6"
+                "2397aa3a.45e876",
+                "c5b3bcfd.d10508"
             ]
         ]
     },
     {
-        "id": "8f0d5ee9.6635d",
+        "id": "2397aa3a.45e876",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3768,
-        "y": 647,
-        "z": "b31344e1.6b9228",
+        "x": 3747,
+        "y": 644,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "684cf1ab.a79f48",
+        "id": "68b3ff1a.0849f",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3249,
-        "y": 1509.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3228,
+        "y": 1506.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "10ff0da4.16d4ea",
-                "55c5195b.3875c8"
+                "6fc92ae0.49bd04",
+                "59f072e2.0b71ec"
             ]
         ]
     },
     {
-        "id": "55c5195b.3875c8",
+        "id": "59f072e2.0b71ec",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3472,
-        "y": 1495.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3451,
+        "y": 1492.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7202d26b.6dffec"
+                "a6cfeb0c.ecbd1"
             ]
         ]
     },
     {
-        "id": "10ff0da4.16d4ea",
+        "id": "6fc92ae0.49bd04",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474,
-        "y": 1528.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3453,
+        "y": 1525.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "30474e74.e5639a"
+                "862c14a1.8553d8"
             ]
         ]
     },
     {
-        "id": "30474e74.e5639a",
+        "id": "862c14a1.8553d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3617,
-        "y": 1525.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3596,
+        "y": 1522.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7202d26b.6dffec",
+        "id": "a6cfeb0c.ecbd1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3620,
-        "y": 1488.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3599,
+        "y": 1485.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "885f2609.7cba58",
-                "e1d06713.adb0c8"
+                "9265a5e9.075d5",
+                "3387bb2a.b4fa7c"
             ]
         ]
     },
     {
-        "id": "885f2609.7cba58",
+        "id": "9265a5e9.075d5",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3814,
-        "y": 1492,
-        "z": "b31344e1.6b9228",
+        "x": 3793,
+        "y": 1489,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d352d101.d008a8",
+        "id": "4430b278.87d9ac",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1078,
-        "y": 197,
-        "z": "b31344e1.6b9228",
+        "x": 1057,
+        "y": 194,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb95643a.1dafd8",
+        "id": "c6965465.aeb14",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 3861,
+        "y": 1240,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "232e8f32.739b48"
+                "d7da00cb.9e6198"
             ]
         ]
     },
     {
-        "id": "232e8f32.739b48",
+        "id": "d7da00cb.9e6198",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4088,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 4067,
+        "y": 1240,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8bbe738e.7fafb"
+                "3e41f9e9.7f65b6"
             ]
         ]
     },
     {
-        "id": "8bbe738e.7fafb",
+        "id": "3e41f9e9.7f65b6",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4303.28564453125,
-        "y": 1242.82177734375,
-        "z": "b31344e1.6b9228",
+        "x": 4282.28564453125,
+        "y": 1239.82177734375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c3ad3464.e3237"
+                "8a860c24.fed68"
             ]
         ]
     },
     {
-        "id": "c3ad3464.e3237",
+        "id": "8a860c24.fed68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4510.1171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4489.1171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f0158859.e44c4",
-                "1be7b379.0a0a35",
-                "bee0e07a.660808"
+                "377e7af0.ac592e",
+                "9af75c5e.34aa1",
+                "ad2bdd99.5817d"
             ]
         ]
     },
     {
-        "id": "f0158859.e44c4",
+        "id": "377e7af0.ac592e",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4725.1171875,
-        "y": 1205.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4704.1171875,
+        "y": 1202.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1be7b379.0a0a35",
+        "id": "9af75c5e.34aa1",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4722.1171875,
-        "y": 1244.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4701.1171875,
+        "y": 1241.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5d7ec3ca.e9fe2c"
+                "817cb438.99e4a8"
             ]
         ]
     },
     {
-        "id": "bee0e07a.660808",
+        "id": "ad2bdd99.5817d",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4677.6171875,
-        "y": 1286.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4656.6171875,
+        "y": 1283.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5d7ec3ca.e9fe2c",
+        "id": "817cb438.99e4a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4902.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4881.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5c631dd4.8f5fbc"
+                "4eac437.160bcbc"
             ]
         ]
     },
     {
-        "id": "5c631dd4.8f5fbc",
+        "id": "4eac437.160bcbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5060.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5039.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d5d5e908.7a8eb8"
+                "602a09ac.ab98b8"
             ]
         ]
     },
     {
-        "id": "d5d5e908.7a8eb8",
+        "id": "602a09ac.ab98b8",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5267.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5246.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "60f3b421.08732c",
+        "id": "83539382.7676b8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3879,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3858,
+        "y": 2109.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "715a89d.cfea178"
+                "5579dfc7.be27d"
             ]
         ]
     },
     {
-        "id": "715a89d.cfea178",
+        "id": "5579dfc7.be27d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4085,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4064,
+        "y": 2109.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "977e3712.429b18"
+                "901fbdc2.3ee4d"
             ]
         ]
     },
     {
-        "id": "977e3712.429b18",
+        "id": "901fbdc2.3ee4d",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4300.28564453125,
-        "y": 2111.8218994140625,
-        "z": "b31344e1.6b9228",
+        "x": 4279.28564453125,
+        "y": 2108.8218994140625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2113d9ff.cdd31e"
+                "2e4b86b2.9caae2"
             ]
         ]
     },
     {
-        "id": "2113d9ff.cdd31e",
+        "id": "2e4b86b2.9caae2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4507.1171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4486.1171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3c92c59b.613ca2",
-                "193b4238.409d8e",
-                "b71c718.f135e1"
+                "bc60382f.b0361",
+                "b3a5cd52.d83f2",
+                "ee9aa3b3.89ca4"
             ]
         ]
     },
     {
-        "id": "3c92c59b.613ca2",
+        "id": "bc60382f.b0361",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4722.1171875,
-        "y": 2074.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4701.1171875,
+        "y": 2071.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "193b4238.409d8e",
+        "id": "b3a5cd52.d83f2",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4719.1171875,
-        "y": 2113.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4698.1171875,
+        "y": 2110.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "df85928.81de67"
+                "93e41626.124d78"
             ]
         ]
     },
     {
-        "id": "b71c718.f135e1",
+        "id": "ee9aa3b3.89ca4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4674.6171875,
-        "y": 2155.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4653.6171875,
+        "y": 2152.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "df85928.81de67",
+        "id": "93e41626.124d78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4899.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4878.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8b1f9fde.337d98"
+                "6ea99290.2aa4d4"
             ]
         ]
     },
     {
-        "id": "8b1f9fde.337d98",
+        "id": "6ea99290.2aa4d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5057.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 5036.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "20d9b129.b72206"
+                "a95428e7.14cad"
             ]
         ]
     },
     {
-        "id": "20d9b129.b72206",
+        "id": "a95428e7.14cad",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5264.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 5243.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "300f312a.b253d6",
+        "id": "c5b3bcfd.d10508",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3795,
-        "y": 719,
-        "z": "b31344e1.6b9228",
+        "x": 3774,
+        "y": 716,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1c354309.a76ffd",
-                "950deba8.cc3e4",
-                "c2c16051.a906d8"
+                "8e60f4cf.82fba",
+                "2cad2896.c9df4",
+                "335dceb2.9bab72"
             ]
         ]
     },
     {
-        "id": "1c354309.a76ffd",
+        "id": "8e60f4cf.82fba",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3990.5001220703125,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 3969.5001220703125,
+        "y": 668,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d41af0c3.594838"
+                "7a06334d.9731e4"
             ]
         ]
     },
     {
-        "id": "950deba8.cc3e4",
+        "id": "2cad2896.c9df4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3982.5001220703125,
-        "y": 726,
-        "z": "b31344e1.6b9228",
+        "x": 3961.5001220703125,
+        "y": 723,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3d15fff1.053cf"
+                "17051d0f.c52e53"
             ]
         ]
     },
     {
-        "id": "c2c16051.a906d8",
+        "id": "335dceb2.9bab72",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3987.5001220703125,
-        "y": 783,
-        "z": "b31344e1.6b9228",
+        "x": 3966.5001220703125,
+        "y": 780,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d7ef8f23.d036"
+                "328eeb2e.ff715c"
             ]
         ]
     },
     {
-        "id": "d7ef8f23.d036",
+        "id": "328eeb2e.ff715c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4139.5001220703125,
-        "y": 784,
-        "z": "b31344e1.6b9228",
+        "x": 4118.5001220703125,
+        "y": 781,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3d15fff1.053cf",
+        "id": "17051d0f.c52e53",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4150.5001220703125,
-        "y": 729,
-        "z": "b31344e1.6b9228",
+        "x": 4129.5001220703125,
+        "y": 726,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d41af0c3.594838",
+        "id": "7a06334d.9731e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4134.8824462890625,
-        "y": 668.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4113.8824462890625,
+        "y": 665.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b45d0128.680c8"
+                "89e57d02.e9996"
             ]
         ]
     },
     {
-        "id": "7cb8afd4.8d20b8",
+        "id": "c9d4f321.66364",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4717,
-        "y": 687,
-        "z": "b31344e1.6b9228",
+        "x": 4696,
+        "y": 684,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "47edc84c.808f88"
+                "f8e16adc.55ac68"
             ]
         ]
     },
     {
-        "id": "47edc84c.808f88",
+        "id": "f8e16adc.55ac68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4894,
-        "y": 679,
-        "z": "b31344e1.6b9228",
+        "x": 4873,
+        "y": 676,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "266ac25a.ea33a6",
-                "2d08c6.2cc1e73a"
+                "f8c4bbbd.612dc",
+                "2cb22463.a9a10c"
             ]
         ]
     },
     {
-        "id": "b45d0128.680c8",
+        "id": "89e57d02.e9996",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4319,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4298,
+        "y": 680,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4f9ef890.59c338"
+                "ffc907a3.634c3"
             ]
         ]
     },
     {
-        "id": "4f9ef890.59c338",
+        "id": "ffc907a3.634c3",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4514,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4493,
+        "y": 680,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7cb8afd4.8d20b8",
-                "212f425.c6d5fbe"
+                "c9d4f321.66364",
+                "d8e84e3d.259878"
             ]
         ]
     },
     {
-        "id": "266ac25a.ea33a6",
+        "id": "f8c4bbbd.612dc",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5132,
-        "y": 634,
-        "z": "b31344e1.6b9228",
+        "x": 5111,
+        "y": 631,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fe7f5526.b757d",
+        "id": "4afa0297.0e92ec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5312,
-        "y": 677,
-        "z": "b31344e1.6b9228",
+        "x": 5291,
+        "y": 674,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c4631195.e5511"
+                "ba53a591.c08868"
             ]
         ]
     },
     {
-        "id": "ace94fc7.113e6",
+        "id": "f0a2c2cf.76f7c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5304,
-        "y": 732,
-        "z": "b31344e1.6b9228",
+        "x": 5283,
+        "y": 729,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "af8bf071.82c85"
+                "3a442fd2.17b8b8"
             ]
         ]
     },
     {
-        "id": "42739782.dc6168",
+        "id": "78f72703.090dd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5309,
-        "y": 789,
-        "z": "b31344e1.6b9228",
+        "x": 5288,
+        "y": 786,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b1e33e76.6db9b"
+                "3131a765.52f598"
             ]
         ]
     },
     {
-        "id": "b1e33e76.6db9b",
+        "id": "3131a765.52f598",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5461,
-        "y": 790,
-        "z": "b31344e1.6b9228",
+        "x": 5440,
+        "y": 787,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "af8bf071.82c85",
+        "id": "3a442fd2.17b8b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5472,
-        "y": 735,
-        "z": "b31344e1.6b9228",
+        "x": 5451,
+        "y": 732,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c4631195.e5511",
+        "id": "ba53a591.c08868",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5456.38232421875,
-        "y": 674.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5435.38232421875,
+        "y": 671.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4dcc9c46.887914"
+                "280c0a87.0e105e"
             ]
         ]
     },
     {
-        "id": "4dcc9c46.887914",
+        "id": "280c0a87.0e105e",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5671,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 5650,
+        "y": 668,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e1d06713.adb0c8",
+        "id": "3387bb2a.b4fa7c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3836,
-        "y": 1560,
-        "z": "b31344e1.6b9228",
+        "x": 3815,
+        "y": 1557,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "34f7d7e6.e7fa8",
-                "cb710953.72942",
-                "4c788e8d.e93588"
+                "4d61cd16.0abdfc",
+                "83252466.aa101",
+                "a13a024e.f66fb"
             ]
         ]
     },
     {
-        "id": "34f7d7e6.e7fa8",
+        "id": "4d61cd16.0abdfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4031.5001220703125,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
+        "x": 4010.5001220703125,
+        "y": 1509,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fd0d1ee5.65b0f"
+                "45754d39.0b500c"
             ]
         ]
     },
     {
-        "id": "cb710953.72942",
+        "id": "83252466.aa101",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023.5001220703125,
-        "y": 1567,
-        "z": "b31344e1.6b9228",
+        "x": 4002.5001220703125,
+        "y": 1564,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "68639fde.fb4de8"
+                "7042d1e3.edb1d"
             ]
         ]
     },
     {
-        "id": "4c788e8d.e93588",
+        "id": "a13a024e.f66fb",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4028.5001220703125,
-        "y": 1624,
-        "z": "b31344e1.6b9228",
+        "x": 4007.5001220703125,
+        "y": 1621,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ed57c904.1da5b"
+                "67ddb18b.39ea7"
             ]
         ]
     },
     {
-        "id": "ed57c904.1da5b",
+        "id": "67ddb18b.39ea7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4180.5001220703125,
-        "y": 1625,
-        "z": "b31344e1.6b9228",
+        "x": 4159.5001220703125,
+        "y": 1622,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "68639fde.fb4de8",
+        "id": "7042d1e3.edb1d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4191.5001220703125,
-        "y": 1570,
-        "z": "b31344e1.6b9228",
+        "x": 4170.5001220703125,
+        "y": 1567,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fd0d1ee5.65b0f",
+        "id": "45754d39.0b500c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4175.8824462890625,
-        "y": 1509.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4154.8824462890625,
+        "y": 1506.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2c890085.25e4f8"
+                "f1a969ab.50fa7"
             ]
         ]
     },
     {
-        "id": "b16b2c11.a7e9e",
+        "id": "e2a984cd.aa357",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4758,
-        "y": 1528,
-        "z": "b31344e1.6b9228",
+        "x": 4737,
+        "y": 1525,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e2c7b2a2.534808"
+                "3a9f2f8b.e28ed"
             ]
         ]
     },
     {
-        "id": "e2c7b2a2.534808",
+        "id": "3a9f2f8b.e28ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4935,
-        "y": 1520,
-        "z": "b31344e1.6b9228",
+        "x": 4914,
+        "y": 1517,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8256d13e.acb508",
-                "e33af2d.2ed629"
+                "53b7b7ea.79ccb8",
+                "abc0256.22d4b58"
             ]
         ]
     },
     {
-        "id": "2c890085.25e4f8",
+        "id": "f1a969ab.50fa7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4360,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4339,
+        "y": 1521,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7ad873b6.5b0624"
+                "f0d37653.530e5"
             ]
         ]
     },
     {
-        "id": "7ad873b6.5b0624",
+        "id": "f0d37653.530e5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4555,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4534,
+        "y": 1521,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b16b2c11.a7e9e",
-                "ba30acec.499f9"
+                "e2a984cd.aa357",
+                "19b04051.d11648"
             ]
         ]
     },
     {
-        "id": "e33af2d.2ed629",
+        "id": "abc0256.22d4b58",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5143,
-        "y": 1527,
-        "z": "b31344e1.6b9228",
+        "x": 5122,
+        "y": 1524,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "dd2f9c6b.57f548",
-                "3b879379.c9bf84",
-                "13b1398c.3c465e"
+                "ee461c39.fc6a98",
+                "85f503dc.f3ae58",
+                "2cdb4338.f53074"
             ]
         ]
     },
     {
-        "id": "8256d13e.acb508",
+        "id": "53b7b7ea.79ccb8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5173,
-        "y": 1475,
-        "z": "b31344e1.6b9228",
+        "x": 5152,
+        "y": 1472,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "dd2f9c6b.57f548",
+        "id": "ee461c39.fc6a98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5353,
-        "y": 1518,
-        "z": "b31344e1.6b9228",
+        "x": 5332,
+        "y": 1515,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "56d2c260.edc91c"
+                "bc865963.b711a"
             ]
         ]
     },
     {
-        "id": "3b879379.c9bf84",
+        "id": "85f503dc.f3ae58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5345,
-        "y": 1573,
-        "z": "b31344e1.6b9228",
+        "x": 5324,
+        "y": 1570,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7449bea.eaa7fc"
+                "f79338ab.92167"
             ]
         ]
     },
     {
-        "id": "13b1398c.3c465e",
+        "id": "2cdb4338.f53074",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5350,
-        "y": 1630,
-        "z": "b31344e1.6b9228",
+        "x": 5329,
+        "y": 1627,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "232c7315.841b1c"
+                "bfc5b714.cbe288"
             ]
         ]
     },
     {
-        "id": "232c7315.841b1c",
+        "id": "bfc5b714.cbe288",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5502,
-        "y": 1631,
-        "z": "b31344e1.6b9228",
+        "x": 5481,
+        "y": 1628,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7449bea.eaa7fc",
+        "id": "f79338ab.92167",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5513,
-        "y": 1576,
-        "z": "b31344e1.6b9228",
+        "x": 5492,
+        "y": 1573,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "56d2c260.edc91c",
+        "id": "bc865963.b711a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5497.38232421875,
-        "y": 1515.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5476.38232421875,
+        "y": 1512.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "49d0cb53.31a39c"
+                "6cd4d323.819c7c"
             ]
         ]
     },
     {
-        "id": "49d0cb53.31a39c",
+        "id": "6cd4d323.819c7c",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5712,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
+        "x": 5691,
+        "y": 1509,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "33bd7ebe.34c502",
+        "id": "53404fc0.a38be",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2796,
-        "y": 452,
-        "z": "b31344e1.6b9228",
+        "x": 2775,
+        "y": 449,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fe8ff063.6863b8",
-                "4e85bccf.c8cf0c"
+                "62e6aba8.2c101c",
+                "9754a6dd.67f03"
             ]
         ]
     },
     {
-        "id": "4e85bccf.c8cf0c",
+        "id": "9754a6dd.67f03",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3077,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3056,
+        "y": 405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "badd7dbd.ce16"
+                "a377e213.201cf8"
             ]
         ]
     },
     {
-        "id": "badd7dbd.ce16",
+        "id": "a377e213.201cf8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3339,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3318,
+        "y": 405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5050eb58.e00ed4"
+                "7737916f.9448f"
             ]
         ]
     },
     {
-        "id": "212f425.c6d5fbe",
+        "id": "d8e84e3d.259878",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4720,
-        "y": 761,
-        "z": "b31344e1.6b9228",
+        "x": 4699,
+        "y": 758,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "656d86d7.e1bb3"
+                "3db61f55.c940b"
             ]
         ]
     },
     {
-        "id": "656d86d7.e1bb3",
+        "id": "3db61f55.c940b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4897,
-        "y": 753,
-        "z": "b31344e1.6b9228",
+        "x": 4876,
+        "y": 750,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4f5b4545.d432fc"
+                "c68e6afb.37cad8"
             ]
         ]
     },
     {
-        "id": "4f5b4545.d432fc",
+        "id": "c68e6afb.37cad8",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5132,
-        "y": 877,
-        "z": "b31344e1.6b9228",
+        "x": 5111,
+        "y": 874,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5e5727f6.ce94f",
+        "id": "70ffeb00.3c6c1c",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5172,
-        "y": 1717,
-        "z": "b31344e1.6b9228",
+        "x": 5151,
+        "y": 1714,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "33761656.d7dc5a",
+        "id": "ce30230.018a56",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4937,
-        "y": 1593,
-        "z": "b31344e1.6b9228",
+        "x": 4916,
+        "y": 1590,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5e5727f6.ce94f"
+                "70ffeb00.3c6c1c"
             ]
         ]
     },
     {
-        "id": "ba30acec.499f9",
+        "id": "19b04051.d11648",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4760,
-        "y": 1601,
-        "z": "b31344e1.6b9228",
+        "x": 4739,
+        "y": 1598,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33761656.d7dc5a"
+                "ce30230.018a56"
             ]
         ]
     },
     {
-        "id": "420f3616.2f701",
+        "id": "36ea936c.0d2d9c",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4378,
-        "y": 538,
-        "z": "b31344e1.6b9228",
+        "x": 4357,
+        "y": 535,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b1349530.c53cc",
+        "id": "39c2d67.9f1a22a",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2734,
-        "y": 672,
-        "z": "b31344e1.6b9228",
+        "x": 2713,
+        "y": 669,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "84b0870f.4db1e",
+        "id": "d6aa9ec.33fa46",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2715,
-        "y": 722,
-        "z": "b31344e1.6b9228",
+        "x": 2694,
+        "y": 719,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dfd81e1.a251ae",
+        "id": "3b75dc28.79bec4",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1972,
-        "y": 224,
-        "z": "b31344e1.6b9228",
+        "x": 1955,
+        "y": 253,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ffb610e.7895d6",
-                "1fed210d.6adb97"
+                "42ce53ea.f9d9f4",
+                "fea2a65.c94cf58"
             ]
         ]
     },
     {
-        "id": "3ffb610e.7895d6",
+        "id": "42ce53ea.f9d9f4",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2256,
-        "y": 194,
-        "z": "b31344e1.6b9228",
+        "x": 2235,
+        "y": 191,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1f03402a.5db7",
+        "id": "72dba682.c63c9",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 2625,
-        "y": 2321,
-        "z": "b31344e1.6b9228",
+        "x": 2604,
+        "y": 2318,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "56710693.e24068",
+        "id": "1b6d1c66.bc0bb4",
         "type": "set",
         "name": "unset parameters",
         "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",
         "comments": "",
-        "x": 2615,
-        "y": 3930,
-        "z": "b31344e1.6b9228",
+        "x": 2594,
+        "y": 3927,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3323f682.f60c3a",
+        "id": "6c32ab13.072304",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2672,
-        "y": 767,
-        "z": "b31344e1.6b9228",
+        "x": 2651,
+        "y": 764,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "13ac3dbd.1f366a",
+        "id": "35f98555.2ceed2",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 2663,
-        "y": 2459,
-        "z": "b31344e1.6b9228",
+        "x": 2639,
+        "y": 2494,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f2924301.397558"
+                "5f7bc0b4.b38de8"
             ]
         ]
     },
     {
-        "id": "647d2436.140504",
+        "id": "3340e53d.b2b492",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "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='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\n",
         "comments": "",
         "outputs": 1,
-        "x": 3789,
-        "y": 2919,
-        "z": "b31344e1.6b9228",
+        "x": 3768,
+        "y": 2916,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "810630b1.0e1b6"
+                "b711db38.ba184"
             ]
         ]
     },
     {
-        "id": "fdfa6fb7.1a35f",
+        "id": "4bdc0f0f.14fc9",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4361.5,
-        "y": 3023,
-        "z": "b31344e1.6b9228",
+        "x": 4340.5,
+        "y": 3020,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "810630b1.0e1b6",
+        "id": "b711db38.ba184",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4095,
-        "y": 2918,
-        "z": "b31344e1.6b9228",
+        "x": 4074,
+        "y": 2915,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a594830d.53acd8"
+                "b22521de.818118"
             ]
         ]
     },
     {
-        "id": "a594830d.53acd8",
+        "id": "b22521de.818118",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4304.5,
-        "y": 2918.25390625,
-        "z": "b31344e1.6b9228",
+        "x": 4283.5,
+        "y": 2915.25390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
-            [
-                "b41cf773.b97ef"
-            ]
+            []
         ]
     },
     {
-        "id": "4c295920.4b5da",
+        "id": "585cd143.7d2b8",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822,
-        "y": 2398,
-        "z": "b31344e1.6b9228",
+        "x": 3801,
+        "y": 2395,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "19452741.32e4c1",
+        "id": "f49c0fd7.2e7c08",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3698,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3677,
+        "y": 3033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9c40fb98.e1f61",
-                "20acba8d.85a5f6"
+                "fed6bc26.f071a8",
+                "1d37d7ca.3763f"
             ]
         ]
     },
     {
-        "id": "9c40fb98.e1f61",
+        "id": "fed6bc26.f071a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3860,
+        "y": 3033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a42fc89d.d0c4a"
+                "73494a81.45e24c"
             ]
         ]
     },
     {
-        "id": "20acba8d.85a5f6",
+        "id": "1d37d7ca.3763f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3706,
-        "y": 3183,
-        "z": "b31344e1.6b9228",
+        "x": 3685,
+        "y": 3180,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "332942c6.7f663e"
+                "d3242d0f.9401e"
             ]
         ]
     },
     {
-        "id": "f5749296.6a691",
+        "id": "e99682a.c4f64",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 3264,
-        "z": "b31344e1.6b9228",
+        "x": 4026,
+        "y": 3261,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2103be8f.1fc842",
-                "1554c822.b8c828"
+                "eb362179.9d3068",
+                "72ad90f5.140788"
             ]
         ]
     },
     {
-        "id": "2103be8f.1fc842",
+        "id": "eb362179.9d3068",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4232,
-        "y": 3265,
-        "z": "b31344e1.6b9228",
+        "x": 4211,
+        "y": 3262,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a1250da6.1c6"
+                "9791b470.15bff8"
             ]
         ]
     },
     {
-        "id": "1554c822.b8c828",
+        "id": "72ad90f5.140788",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251,
-        "y": 3531,
-        "z": "b31344e1.6b9228",
+        "x": 4230,
+        "y": 3528,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "99adbaff.3e741"
+                "aff1f53d.8faa"
             ]
         ]
     },
     {
-        "id": "f416ea28.cb6ab",
+        "id": "c78f87c4.9bed48",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4662,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4641,
+        "y": 3263,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6548b2c.2addd8",
+        "id": "d7d2c7f0.8e25f8",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4736,
-        "y": 3564,
-        "z": "b31344e1.6b9228",
+        "x": 4715,
+        "y": 3561,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddd52155.f542e8",
+        "id": "1d6b059f.4c3bfa",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4672,
-        "y": 3615,
-        "z": "b31344e1.6b9228",
+        "x": 4651,
+        "y": 3612,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a14f6e93.1adaf8",
+        "id": "3d6ca865.871a5",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4801,
-        "y": 3665,
-        "z": "b31344e1.6b9228",
+        "x": 4780,
+        "y": 3662,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "16a831c0.877516",
+        "id": "cd227f8a.a8638",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 4811,
-        "y": 3508,
-        "z": "b31344e1.6b9228",
+        "x": 4790,
+        "y": 3505,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2e301756.38a228",
+        "id": "bfa230df.6f6f98",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4769,
-        "y": 3724,
-        "z": "b31344e1.6b9228",
+        "x": 4748,
+        "y": 3721,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "99adbaff.3e741",
+        "id": "aff1f53d.8faa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4408,
-        "y": 3532,
-        "z": "b31344e1.6b9228",
+        "x": 4387,
+        "y": 3529,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e6548b2c.2addd8",
-                "ddd52155.f542e8",
-                "a14f6e93.1adaf8",
-                "2e301756.38a228",
-                "ebae712b.9f6bf8"
+                "d7d2c7f0.8e25f8",
+                "1d6b059f.4c3bfa",
+                "3d6ca865.871a5",
+                "bfa230df.6f6f98",
+                "12522f2b.6fc8b1"
             ]
         ]
     },
     {
-        "id": "f2924301.397558",
+        "id": "5f7bc0b4.b38de8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2925,
-        "y": 2465,
-        "z": "b31344e1.6b9228",
+        "x": 2908,
+        "y": 2494,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4c295920.4b5da",
-                "647d2436.140504",
-                "19452741.32e4c1",
-                "1d59f70d.1ee6c9",
-                "b15a67ed.f1cb18",
-                "e4fb52b5.f04798",
-                "f5263d8c.0dd66"
+                "585cd143.7d2b8",
+                "3340e53d.b2b492",
+                "f49c0fd7.2e7c08",
+                "f42a2589.31a0b",
+                "cc8174a8.50b7f",
+                "90db4521.56089",
+                "7bd1d477.e03354"
             ]
         ]
     },
     {
-        "id": "2e1edee2.ee8112",
+        "id": "4e1b8da0.7824b4",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 4286,
-        "y": 3080,
-        "z": "b31344e1.6b9228",
+        "x": 4265,
+        "y": 3077,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ba046748.bfe1b",
+        "id": "5449eb52.31f6ec",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4339,
-        "y": 3124,
-        "z": "b31344e1.6b9228",
+        "x": 4318,
+        "y": 3121,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b63ee960.cee2c",
-                "1b1f60e5.7a7c9f"
+                "1830f22c.565b16",
+                "d371e563.9b53a"
             ]
         ]
     },
     {
-        "id": "1b1f60e5.7a7c9f",
+        "id": "d371e563.9b53a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4610,
-        "y": 3109,
-        "z": "b31344e1.6b9228",
+        "x": 4589,
+        "y": 3106,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e9f5d50.e9a0928"
+                "e029f2f6.ad875"
             ]
         ]
     },
     {
-        "id": "b63ee960.cee2c",
+        "id": "1830f22c.565b16",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.000213623047,
-        "y": 3166.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4587.000213623047,
+        "y": 3163.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c9e53751.966bb8"
+                "adfa6667.8c9cb"
             ]
         ]
     },
     {
-        "id": "e9f5d50.e9a0928",
+        "id": "e029f2f6.ad875",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 4750.000247955322,
-        "y": 3109.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 4729.000247955322,
+        "y": 3106.0000009536743,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c9e53751.966bb8",
+        "id": "adfa6667.8c9cb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4756.02725982666,
-        "y": 3157.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 4735.02725982666,
+        "y": 3154.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a42fc89d.d0c4a",
+        "id": "73494a81.45e24c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4022,
-        "y": 3026,
-        "z": "b31344e1.6b9228",
+        "x": 4001,
+        "y": 3023,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fdfa6fb7.1a35f",
-                "ba046748.bfe1b",
-                "2e1edee2.ee8112"
+                "4bdc0f0f.14fc9",
+                "5449eb52.31f6ec",
+                "4e1b8da0.7824b4"
             ]
         ]
     },
     {
-        "id": "a1250da6.1c6",
+        "id": "9791b470.15bff8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4366,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4345,
+        "y": 3263,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f416ea28.cb6ab",
-                "6f1cb48c.6026e4",
-                "1cf9708b.795d07"
+                "c78f87c4.9bed48",
+                "96e361f0.0cb568",
+                "e43c5196.95971"
             ]
         ]
     },
     {
-        "id": "1cf9708b.795d07",
+        "id": "e43c5196.95971",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 4586,
-        "y": 3310,
-        "z": "b31344e1.6b9228",
+        "x": 4565,
+        "y": 3307,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6f1cb48c.6026e4",
+        "id": "96e361f0.0cb568",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4637,
-        "y": 3354,
-        "z": "b31344e1.6b9228",
+        "x": 4616,
+        "y": 3351,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6e1323b5.c04ce4",
-                "1555b51f.0ca46b"
+                "d02e29cf.263e8",
+                "ecba049c.afd758"
             ]
         ]
     },
     {
-        "id": "1555b51f.0ca46b",
+        "id": "ecba049c.afd758",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4900,
-        "y": 3334,
-        "z": "b31344e1.6b9228",
+        "x": 4879,
+        "y": 3331,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7a3f18c.e7bf268"
+                "335f23f9.119f0c"
             ]
         ]
     },
     {
-        "id": "6e1323b5.c04ce4",
+        "id": "d02e29cf.263e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4901.000213623047,
-        "y": 3384.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4880.000213623047,
+        "y": 3381.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c1d2c5de.5e2688"
+                "49ab66fd.a6d9f8"
             ]
         ]
     },
     {
-        "id": "7a3f18c.e7bf268",
+        "id": "335f23f9.119f0c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 5040.000247955322,
-        "y": 3334.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 5019.000247955322,
+        "y": 3331.0000009536743,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c1d2c5de.5e2688",
+        "id": "49ab66fd.a6d9f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5046.02725982666,
-        "y": 3382.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 5025.02725982666,
+        "y": 3379.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebae712b.9f6bf8",
+        "id": "12522f2b.6fc8b1",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 4683,
-        "y": 3784,
-        "z": "b31344e1.6b9228",
+        "x": 4662,
+        "y": 3781,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bc1d9c19.8a817",
+        "id": "48979781.1681f8",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2002,
-        "y": 4131,
-        "z": "b31344e1.6b9228",
+        "x": 1981,
+        "y": 4128,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3b12d36f.6d8234",
-                "89a53740.4d3c98",
-                "a61d86b5.6c70f"
+                "c2f0d7a5.dddd68",
+                "39032723.2690f8",
+                "52e0bd76.c6817c"
             ]
         ]
     },
     {
-        "id": "3b12d36f.6d8234",
+        "id": "c2f0d7a5.dddd68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2190,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 2169,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ced61cb.b2d7fe"
+                "ab5cddb1.22da4"
             ]
         ]
     },
     {
-        "id": "89a53740.4d3c98",
+        "id": "39032723.2690f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2190.490966796875,
-        "y": 4189.574035644531,
-        "z": "b31344e1.6b9228",
+        "x": 2169.490966796875,
+        "y": 4186.574035644531,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3eafcbaf.f2f56c"
+                "14fe4895.b40197"
             ]
         ]
     },
     {
-        "id": "a61d86b5.6c70f",
+        "id": "52e0bd76.c6817c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2188,
-        "y": 4233,
-        "z": "b31344e1.6b9228",
+        "x": 2167,
+        "y": 4230,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "170e04a2.1b39fb"
+                "b5248481.e522a"
             ]
         ]
     },
     {
-        "id": "3ced61cb.b2d7fe",
+        "id": "ab5cddb1.22da4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2363,
-        "y": 4142,
-        "z": "b31344e1.6b9228",
+        "x": 2342,
+        "y": 4139,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ef9d0591.fefb08"
+                "4470cae1.fbd614"
             ]
         ]
     },
     {
-        "id": "3eafcbaf.f2f56c",
+        "id": "14fe4895.b40197",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2353.0623779296875,
-        "y": 4189.859771728516,
-        "z": "b31344e1.6b9228",
+        "x": 2332.0623779296875,
+        "y": 4186.859771728516,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "170e04a2.1b39fb",
+        "id": "b5248481.e522a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2355,
-        "y": 4232,
-        "z": "b31344e1.6b9228",
+        "x": 2334,
+        "y": 4229,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bf30e0be.23b998",
+        "id": "5d2f9da2.d38694",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1991,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 1970,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "557999e1.77dcb"
+                "8dfa636a.7429d"
             ]
         ]
     },
     {
-        "id": "d613988a.0c40c",
+        "id": "e79af240.ca6e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2801,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2780,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e4afc290.74f038"
+                "6c6212ef.f90554"
             ]
         ]
     },
     {
-        "id": "f7f46916.4f1ee",
+        "id": "da3d1785.252e3",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2573,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2552,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d613988a.0c40c"
+                "e79af240.ca6e5"
             ]
         ]
     },
     {
-        "id": "ce29a297.cf1cb8",
+        "id": "14ccf193.a7ba36",
         "type": "set",
         "name": "set providerValue",
         "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",
         "comments": "",
-        "x": 3693,
-        "y": 4089,
-        "z": "b31344e1.6b9228",
+        "x": 3672,
+        "y": 4086,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "90828ea.8f9357",
+        "id": "3ba4980a.a7808",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 3995,
-        "y": 3215,
-        "z": "b31344e1.6b9228",
+        "x": 3974,
+        "y": 3212,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "332942c6.7f663e",
+        "id": "d3242d0f.9401e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3830,
-        "y": 3190,
-        "z": "b31344e1.6b9228",
+        "x": 3809,
+        "y": 3187,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "90828ea.8f9357",
-                "f5749296.6a691"
+                "3ba4980a.a7808",
+                "e99682a.c4f64"
             ]
         ]
     },
     {
-        "id": "d0adb7e4.435f98",
+        "id": "a26db7da.175a4",
         "type": "set",
         "name": "set tmp.arr",
-        "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\n",
+        "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\n",
         "comments": "",
-        "x": 1954,
-        "y": 170,
-        "z": "b31344e1.6b9228",
+        "x": 1929,
+        "y": 203,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ef9d0591.fefb08",
+        "id": "4470cae1.fbd614",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2592,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 2571,
+        "y": 4140,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2fbee9b.ff76316"
+                "af51805a.3f6e48"
             ]
         ]
     },
     {
-        "id": "2fbee9b.ff76316",
+        "id": "af51805a.3f6e48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2807,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 2786,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9baaaca4.d54a4"
+                "b29ba493.8896c8"
             ]
         ]
     },
     {
-        "id": "49f4d5cd.eba3ac",
+        "id": "de53bb83.199eb",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4260,
-        "y": 4064,
-        "z": "b31344e1.6b9228",
+        "x": 4239,
+        "y": 4061,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a296aaec.6a9f7"
+                "204c9a7d.7d28b6"
             ]
         ]
     },
     {
-        "id": "72392f69.a40338",
+        "id": "4aa9ee27.313a08",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 3705,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1e30cbc6.5b29c4",
-                "73a572c0.fcdcfc"
+                "2d961aee.1b3a76",
+                "3325a435.f57dbc"
             ]
         ]
     },
     {
-        "id": "1e30cbc6.5b29c4",
+        "id": "2d961aee.1b3a76",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3922,
-        "y": 4114,
-        "z": "b31344e1.6b9228",
+        "x": 3901,
+        "y": 4111,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "79192fda.22a8a8"
+                "78c69440.64f1a4"
             ]
         ]
     },
     {
-        "id": "73a572c0.fcdcfc",
+        "id": "3325a435.f57dbc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3923,
-        "y": 4185,
-        "z": "b31344e1.6b9228",
+        "x": 3902,
+        "y": 4182,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e5b5d449.e95738"
+                "fefe3e36.023678"
             ]
         ]
     },
     {
-        "id": "79192fda.22a8a8",
+        "id": "78c69440.64f1a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4073,
-        "y": 4112,
-        "z": "b31344e1.6b9228",
+        "x": 4052,
+        "y": 4109,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "49f4d5cd.eba3ac",
-                "ee34549a.68661"
+                "de53bb83.199eb",
+                "8df94468.3b3aa8"
             ]
         ]
     },
     {
-        "id": "a296aaec.6a9f7",
+        "id": "204c9a7d.7d28b6",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4551,
-        "y": 4064,
-        "z": "b31344e1.6b9228",
+        "x": 4530,
+        "y": 4061,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f6a570fa.8c3e18",
-                "f096fdfa.51af18"
+                "c41481ab.88bea8",
+                "e1b07d6e.872148"
             ]
         ]
     },
     {
-        "id": "f6a570fa.8c3e18",
+        "id": "c41481ab.88bea8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4826,
-        "y": 4033,
-        "z": "b31344e1.6b9228",
+        "x": 4805,
+        "y": 4030,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7e64bb9a.5c5954"
+                "f1ff9d18.303e98"
             ]
         ]
     },
     {
-        "id": "f096fdfa.51af18",
+        "id": "e1b07d6e.872148",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4827,
-        "y": 4104,
-        "z": "b31344e1.6b9228",
+        "x": 4806,
+        "y": 4101,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2ae9b410.b8e274"
+                "14131c89.49f9f3"
             ]
         ]
     },
     {
-        "id": "7e64bb9a.5c5954",
+        "id": "f1ff9d18.303e98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4977,
-        "y": 4031,
-        "z": "b31344e1.6b9228",
+        "x": 4956,
+        "y": 4028,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "883ad39b.46747",
-                "3d5cad7b.78211a",
-                "ac8bc417.7b82a",
-                "6ea95490.220544",
-                "6a39b9a6.2592"
+                "40d1e81e.6cc88",
+                "dbbf7f90.5aa4c8",
+                "83374978.c1c35",
+                "d7033d3e.83e278",
+                "8b158b61.9a9f58"
             ]
         ]
     },
     {
-        "id": "883ad39b.46747",
+        "id": "40d1e81e.6cc88",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 5165,
-        "y": 3991,
-        "z": "b31344e1.6b9228",
+        "x": 5144,
+        "y": 3988,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3d5cad7b.78211a",
+        "id": "dbbf7f90.5aa4c8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 5237,
-        "y": 4036,
-        "z": "b31344e1.6b9228",
+        "x": 5216,
+        "y": 4033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a39b9a6.2592",
+        "id": "8b158b61.9a9f58",
         "type": "set",
         "name": "set twoD arr",
         "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",
         "comments": "",
-        "x": 5152,
-        "y": 4163,
-        "z": "b31344e1.6b9228",
+        "x": 5131,
+        "y": 4160,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6ea95490.220544",
+        "id": "d7033d3e.83e278",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 5173,
-        "y": 4099,
-        "z": "b31344e1.6b9228",
+        "x": 5152,
+        "y": 4096,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e5b5d449.e95738",
+        "id": "fefe3e36.023678",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4075,
-        "y": 4185,
-        "z": "b31344e1.6b9228",
+        "x": 4054,
+        "y": 4182,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b867d047.fac",
-                "3788e630.590d72"
+                "8b5a5937.7b14e8",
+                "738e0247.d8b784"
             ]
         ]
     },
     {
-        "id": "b867d047.fac",
+        "id": "8b5a5937.7b14e8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4330,
-        "y": 4178,
-        "z": "b31344e1.6b9228",
+        "x": 4309,
+        "y": 4175,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3788e630.590d72",
+        "id": "738e0247.d8b784",
         "type": "set",
         "name": "set twoD array",
         "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",
         "comments": "",
-        "x": 4258,
-        "y": 4225,
-        "z": "b31344e1.6b9228",
+        "x": 4237,
+        "y": 4222,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ee34549a.68661",
+        "id": "8df94468.3b3aa8",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251,
-        "y": 4109,
-        "z": "b31344e1.6b9228",
+        "x": 4230,
+        "y": 4106,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d1f76975.e11b9",
-                "3421ae07.ec9d62"
+                "df11cc3e.1263f",
+                "1fe91094.d80647"
             ]
         ]
     },
     {
-        "id": "d1f76975.e11b9",
+        "id": "df11cc3e.1263f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4411,
-        "y": 4101,
-        "z": "b31344e1.6b9228",
+        "x": 4390,
+        "y": 4098,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2d9d0080.4d96d"
+                "6014caa7.dd1974"
             ]
         ]
     },
     {
-        "id": "3421ae07.ec9d62",
+        "id": "1fe91094.d80647",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4409,
-        "y": 4138,
-        "z": "b31344e1.6b9228",
+        "x": 4388,
+        "y": 4135,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "91314308.ab84d"
+                "4b7b9538.9e1144"
             ]
         ]
     },
     {
-        "id": "2d9d0080.4d96d",
+        "id": "6014caa7.dd1974",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4536,
-        "y": 4101,
-        "z": "b31344e1.6b9228",
+        "x": 4515,
+        "y": 4098,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd3f24a6.bbbfb8",
+        "id": "f4cf80fc.6110b8",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4843,
-        "y": 4159,
-        "z": "b31344e1.6b9228",
+        "x": 4822,
+        "y": 4156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "91314308.ab84d",
+        "id": "4b7b9538.9e1144",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4569,
-        "y": 4146,
-        "z": "b31344e1.6b9228",
+        "x": 4548,
+        "y": 4143,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fd3f24a6.bbbfb8",
-                "3fbaf181.1ff88e"
+                "f4cf80fc.6110b8",
+                "cb01b96d.902da8"
             ]
         ]
     },
     {
-        "id": "3fbaf181.1ff88e",
+        "id": "cb01b96d.902da8",
         "type": "set",
         "name": "set twoD array",
         "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",
         "comments": "",
-        "x": 4760,
-        "y": 4205,
-        "z": "b31344e1.6b9228",
+        "x": 4739,
+        "y": 4202,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2ae9b410.b8e274",
+        "id": "14131c89.49f9f3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4960,
-        "y": 4103,
-        "z": "b31344e1.6b9228",
+        "x": 4939,
+        "y": 4100,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac8bc417.7b82a",
+        "id": "83374978.c1c35",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5131,
-        "y": 4230,
-        "z": "b31344e1.6b9228",
+        "x": 5110,
+        "y": 4227,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1d59f70d.1ee6c9",
+        "id": "f42a2589.31a0b",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536,
-        "y": 2488,
-        "z": "b31344e1.6b9228",
+        "x": 3515,
+        "y": 2485,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "13d01e4b.11cf72",
-                "f41dda2a.86b79"
+                "ac6a7600.1391a8",
+                "6c99c1a3.b2c848"
             ]
         ]
     },
     {
-        "id": "13d01e4b.11cf72",
+        "id": "ac6a7600.1391a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3902,
-        "y": 2449,
-        "z": "b31344e1.6b9228",
+        "x": 3881,
+        "y": 2446,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a63400f9.70b798"
+                "c094d1a4.3a348"
             ]
         ]
     },
     {
-        "id": "f41dda2a.86b79",
+        "id": "6c99c1a3.b2c848",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3903,
-        "y": 2495,
-        "z": "b31344e1.6b9228",
+        "x": 3882,
+        "y": 2492,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "201cd4b0.391f6c"
+                "11e69cf.d047563"
             ]
         ]
     },
     {
-        "id": "a63400f9.70b798",
+        "id": "c094d1a4.3a348",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "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",
         "comments": "",
-        "x": 4116,
-        "y": 2448,
-        "z": "b31344e1.6b9228",
+        "x": 4095,
+        "y": 2445,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "201cd4b0.391f6c",
+        "id": "11e69cf.d047563",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "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",
         "comments": "",
-        "x": 4114,
-        "y": 2493,
-        "z": "b31344e1.6b9228",
+        "x": 4093,
+        "y": 2490,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e4afc290.74f038",
+        "id": "6c6212ef.f90554",
         "type": "set",
         "name": "set attachment_param sliceG",
         "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`\" />",
         "comments": "",
-        "x": 3054,
-        "y": 4320,
-        "z": "b31344e1.6b9228",
+        "x": 3033,
+        "y": 4317,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5a129ea2.020ec",
+        "id": "a54ce659.29b108",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2639,
-        "y": 4428,
-        "z": "b31344e1.6b9228",
+        "x": 2618,
+        "y": 4425,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "235df5b8.967b5a",
-                "2fcb7bfa.e794ec"
+                "3fa26ce7.7e0224",
+                "b2b0e72c.a11478"
             ]
         ]
     },
     {
-        "id": "2fcb7bfa.e794ec",
+        "id": "b2b0e72c.a11478",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2922,
-        "y": 4408,
-        "z": "b31344e1.6b9228",
+        "x": 2901,
+        "y": 4405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ec27b172.f3b03"
+                "fa1f56ce.f832c8"
             ]
         ]
     },
     {
-        "id": "235df5b8.967b5a",
+        "id": "3fa26ce7.7e0224",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2923.000213623047,
-        "y": 4458.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 2902.000213623047,
+        "y": 4455.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "afac7d54.5ea3c8"
+                "50896aad.7e40ec"
             ]
         ]
     },
     {
-        "id": "ec27b172.f3b03",
+        "id": "fa1f56ce.f832c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 3062.0002479553223,
-        "y": 4408.000000953674,
-        "z": "b31344e1.6b9228",
+        "x": 3041.0002479553223,
+        "y": 4405.000000953674,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "afac7d54.5ea3c8",
+        "id": "50896aad.7e40ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3068.02725982666,
-        "y": 4456.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 3047.02725982666,
+        "y": 4453.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b15a67ed.f1cb18",
+        "id": "cc8174a8.50b7f",
         "type": "set",
         "name": "set srcdstpnf-name",
         "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",
         "comments": "",
-        "x": 3712,
-        "y": 2562,
-        "z": "b31344e1.6b9228",
+        "x": 3691,
+        "y": 2559,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e4fb52b5.f04798",
+        "id": "90db4521.56089",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 2610,
-        "z": "b31344e1.6b9228",
+        "x": 3735,
+        "y": 2607,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "38280842.8f481",
-                "762394a6.8c9edc",
-                "bf6967d.9863518"
+                "3240cb0e.b7a8d4",
+                "f04379f7.8df68",
+                "3ab1dbdc.5ba7f4"
             ]
         ]
     },
     {
-        "id": "38280842.8f481",
+        "id": "3240cb0e.b7a8d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5,
-        "y": 2557,
-        "z": "b31344e1.6b9228",
+        "x": 3947.5,
+        "y": 2554,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7c3bab6c.40727c"
+                "e8a8f72b.6c9a08"
             ]
         ]
     },
     {
-        "id": "762394a6.8c9edc",
+        "id": "f04379f7.8df68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980.5,
-        "y": 2607,
-        "z": "b31344e1.6b9228",
+        "x": 3959.5,
+        "y": 2604,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9fa14d44.80429"
+                "b12e923.fc82e7"
             ]
         ]
     },
     {
-        "id": "bf6967d.9863518",
+        "id": "3ab1dbdc.5ba7f4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3971.5,
-        "y": 2662,
-        "z": "b31344e1.6b9228",
+        "x": 3950.5,
+        "y": 2659,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e6f16a7e.5e034"
+                "582f59ae.92f2a8"
             ]
         ]
     },
     {
-        "id": "e6f16a7e.5e034",
+        "id": "582f59ae.92f2a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4116.5,
-        "y": 2661,
-        "z": "b31344e1.6b9228",
+        "x": 4095.5,
+        "y": 2658,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9fa14d44.80429",
+        "id": "b12e923.fc82e7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4127.5,
-        "y": 2604,
-        "z": "b31344e1.6b9228",
+        "x": 4106.5,
+        "y": 2601,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7c3bab6c.40727c",
+        "id": "e8a8f72b.6c9a08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4093.8824462890625,
-        "y": 2550.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4072.8824462890625,
+        "y": 2547.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ada39cb.077d7e"
+                "212a31bf.dceac6"
             ]
         ]
     },
     {
-        "id": "79f49c03.b31834",
+        "id": "935dfeb6.9be7f8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4653,
-        "y": 2569,
-        "z": "b31344e1.6b9228",
+        "x": 4632,
+        "y": 2566,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b38ec96c.50bcb"
+                "1328892f.88f617"
             ]
         ]
     },
     {
-        "id": "b38ec96c.50bcb",
+        "id": "1328892f.88f617",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4830,
-        "y": 2561,
-        "z": "b31344e1.6b9228",
+        "x": 4809,
+        "y": 2558,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b25407c2.fe4e9",
-                "76abd2d6.8cf2bc"
+                "6a8226d0.94ebf",
+                "3a8b4f5e.be2aa8"
             ]
         ]
     },
     {
-        "id": "3ada39cb.077d7e",
+        "id": "212a31bf.dceac6",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4255,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4234,
+        "y": 2562,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "631c6ac2.9b4684"
+                "384efd0c.a6d9aa"
             ]
         ]
     },
     {
-        "id": "631c6ac2.9b4684",
+        "id": "384efd0c.a6d9aa",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4450,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4429,
+        "y": 2562,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "79f49c03.b31834"
+                "935dfeb6.9be7f8"
             ]
         ]
     },
     {
-        "id": "76abd2d6.8cf2bc",
+        "id": "3a8b4f5e.be2aa8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5038,
-        "y": 2568,
-        "z": "b31344e1.6b9228",
+        "x": 5017,
+        "y": 2565,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b500a3b6.711188",
-                "e4ff3e60.96d148",
-                "ef9c5a3.20232a8"
+                "a2f18412.fa34",
+                "938b13a9.db22e",
+                "e46fd8a5.7a34e8"
             ]
         ]
     },
     {
-        "id": "b25407c2.fe4e9",
+        "id": "6a8226d0.94ebf",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "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",
         "comments": "",
-        "x": 5068,
-        "y": 2516,
-        "z": "b31344e1.6b9228",
+        "x": 5047,
+        "y": 2513,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b500a3b6.711188",
+        "id": "a2f18412.fa34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5248,
-        "y": 2559,
-        "z": "b31344e1.6b9228",
+        "x": 5227,
+        "y": 2556,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8c9a0f1.a2e9b7"
+                "dfc55645.4078e"
             ]
         ]
     },
     {
-        "id": "e4ff3e60.96d148",
+        "id": "938b13a9.db22e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5240,
-        "y": 2614,
-        "z": "b31344e1.6b9228",
+        "x": 5219,
+        "y": 2611,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7d5ba752.0bac28"
+                "ad8534e.8f07fc8"
             ]
         ]
     },
     {
-        "id": "ef9c5a3.20232a8",
+        "id": "e46fd8a5.7a34e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5245,
-        "y": 2671,
-        "z": "b31344e1.6b9228",
+        "x": 5224,
+        "y": 2668,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5979580a.e6b1f8"
+                "292bb9fe.d0f886"
             ]
         ]
     },
     {
-        "id": "5979580a.e6b1f8",
+        "id": "292bb9fe.d0f886",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5397,
-        "y": 2672,
-        "z": "b31344e1.6b9228",
+        "x": 5376,
+        "y": 2669,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7d5ba752.0bac28",
+        "id": "ad8534e.8f07fc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5408,
-        "y": 2617,
-        "z": "b31344e1.6b9228",
+        "x": 5387,
+        "y": 2614,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8c9a0f1.a2e9b7",
+        "id": "dfc55645.4078e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5392.38232421875,
-        "y": 2556.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5371.38232421875,
+        "y": 2553.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b4fe40f1.fee308"
+                "295d998d.b4f986"
             ]
         ]
     },
     {
-        "id": "b4fe40f1.fee308",
+        "id": "295d998d.b4f986",
         "type": "set",
         "name": "set controller domainA data",
         "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",
         "comments": "",
-        "x": 5607,
-        "y": 2553,
-        "z": "b31344e1.6b9228",
+        "x": 5586,
+        "y": 2550,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "557999e1.77dcb",
+        "id": "8dfa636a.7429d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2223,
-        "y": 4320,
-        "z": "b31344e1.6b9228",
+        "x": 2202,
+        "y": 4317,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f7f46916.4f1ee",
-                "5a129ea2.020ec"
+                "da3d1785.252e3",
+                "a54ce659.29b108"
             ]
         ]
     },
     {
-        "id": "f5263d8c.0dd66",
+        "id": "7bd1d477.e03354",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
+        "x": 3705,
+        "y": 2776,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cb45f40e.c4e9f",
-                "686c2e71.b364f8"
+                "3ed7d0cf.bd363",
+                "60e3c11b.60b2b8"
             ]
         ]
     },
     {
-        "id": "cb45f40e.c4e9f",
+        "id": "3ed7d0cf.bd363",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
+        "x": 3906,
+        "y": 2774,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "906b7761.ec3cf"
+                "c5282b2e.c25f08"
             ]
         ]
     },
     {
-        "id": "906b7761.ec3cf",
+        "id": "7fc9a02.f9a08e",
         "type": "set",
-        "name": "set attachment_param domain A",
-        "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`' />",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4141,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
+        "x": 4187,
+        "y": 2724,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bb50949c.2c4e68",
+        "id": "6fcb3e30.7095c8",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144,
-        "y": 2828,
-        "z": "b31344e1.6b9228",
+        "x": 4123,
+        "y": 2825,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f9f184f6.8f0c58",
-                "b1eb5cf.84b33a"
+                "65a08e4c.a1dc",
+                "640adf38.eff8b"
             ]
         ]
     },
     {
-        "id": "f9f184f6.8f0c58",
+        "id": "65a08e4c.a1dc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4374,
-        "y": 2824,
-        "z": "b31344e1.6b9228",
+        "x": 4353,
+        "y": 2821,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ea46128e.0ba028"
+                "4413ca18.7ca70c"
             ]
         ]
     },
     {
-        "id": "ea46128e.0ba028",
+        "id": "8da31065.a87e4",
         "type": "set",
         "name": "set attachment_param domain B",
         "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]`' />",
         "comments": "",
-        "x": 4588,
-        "y": 2827,
-        "z": "b31344e1.6b9228",
+        "x": 4690,
+        "y": 2765,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "686c2e71.b364f8",
+        "id": "60e3c11b.60b2b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2826,
-        "z": "b31344e1.6b9228",
+        "x": 3906,
+        "y": 2823,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bb50949c.2c4e68"
+                "6fcb3e30.7095c8"
             ]
         ]
     },
     {
-        "id": "b1eb5cf.84b33a",
+        "id": "640adf38.eff8b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4375,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "x": 4354,
+        "y": 2867,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "591dd2d5.72937c"
+                "7faf9acd.559b34"
             ]
         ]
     },
     {
-        "id": "591dd2d5.72937c",
+        "id": "7faf9acd.559b34",
         "type": "set",
         "name": "set attachment_param domain G",
         "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`' />",
         "comments": "",
-        "x": 4589,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "x": 4568,
+        "y": 2867,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b41cf773.b97ef",
+        "id": "9723f206.45f868",
         "type": "set",
         "name": "set tmp.slicevpns",
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 4487,
-        "y": 2919,
-        "z": "b31344e1.6b9228",
+        "x": 4466,
+        "y": 2916,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9baaaca4.d54a4",
+        "id": "b29ba493.8896c8",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "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].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 3030,
+        "y": 4140,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cb64ffb8.43ead",
-                "d4b6930e.5ef778"
+                "174edd69.713c5b",
+                "af581154.4e753"
             ]
         ]
     },
     {
-        "id": "cb64ffb8.43ead",
+        "id": "174edd69.713c5b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3268,
-        "y": 4122,
-        "z": "b31344e1.6b9228",
+        "x": 3247,
+        "y": 4119,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2504214d.099dbe"
+                "53925b1.87893a4"
             ]
         ]
     },
     {
-        "id": "d4b6930e.5ef778",
+        "id": "af581154.4e753",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3268,
-        "y": 4171,
-        "z": "b31344e1.6b9228",
+        "x": 3247,
+        "y": 4168,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2504214d.099dbe",
+        "id": "53925b1.87893a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3436,
-        "y": 4122,
-        "z": "b31344e1.6b9228",
+        "x": 3415,
+        "y": 4119,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            [
+                "14ccf193.a7ba36",
+                "4aa9ee27.313a08"
+            ]
+        ]
+    },
+    {
+        "id": "2f0ddb5a.e806c4",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "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`' />",
+        "comments": "",
+        "x": 4242,
+        "y": 2771,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "c5282b2e.c25f08",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4030,
+        "y": 2765,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            [
+                "2f0ddb5a.e806c4"
+            ]
+        ]
+    },
+    {
+        "id": "60f94c1c.9e2504",
+        "type": "set",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
+        "comments": "",
+        "x": 4642,
+        "y": 2813,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "4413ca18.7ca70c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4486,
+        "y": 2797,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ce29a297.cf1cb8",
-                "72392f69.a40338"
+                "8da31065.a87e4"
             ]
         ]
+    },
+    {
+        "id": "93c183ce.0a9ed8",
+        "type": "get-resource",
+        "name": "get-resource pnfs-list",
+        "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\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972,
+        "y": 62,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d8a5506.b8ac8c",
+        "type": "get-resource",
+        "name": "get-resource logical-links",
+        "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\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1984,
+        "y": 103,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "307d8c13.43fe3c",
+        "type": "comment",
+        "name": "The following two nodes are for PCE",
+        "info": "",
+        "comments": "",
+        "x": 2008,
+        "y": 25,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "86333e24.199f7",
+        "type": "set",
+        "name": "set tmp.arr",
+        "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
+        "comments": "",
+        "x": 1929,
+        "y": 149,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "63cf541.20dacac",
+        "type": "execute",
+        "name": "execute printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2615,
+        "y": 2432,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file