X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json;h=f834a97350661ff85d485589afb174d3800a3dbc;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=c1b37ce6c7eaedddbd5c216dad72db25264aba5e;hpb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index c1b37ce6..f834a973 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "458f4ac.c4718b4",
+    "id": "760c3032.024ec8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 134.88333129882812,
-    "y": 96.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 176.56666564941406,
+    "y": 129.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2b796419.174294"
+        "5c65c97e.4fcce"
       ]
     ]
   },
   {
-    "id": "2b796419.174294",
+    "id": "5c65c97e.4fcce",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,5709 +22,7887 @@
     "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": 419.1690216064453,
-    "y": 158.12143993377686,
-    "z": "4456793a.59a288",
+    "x": 460.85235595703125,
+    "y": 190.8047742843628,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "81638429.4a926"
+        "f52e4a2.8e9b7b8"
       ]
     ]
   },
   {
-    "id": "81638429.4a926",
+    "id": "f52e4a2.8e9b7b8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 425.3119354248047,
-    "y": 242.88336181640625,
-    "z": "4456793a.59a288",
+    "x": 466.9952697753906,
+    "y": 275.5666961669922,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "49ee9c33.493f7c"
+        "f52145b6.00f26"
       ]
     ]
   },
   {
-    "id": "49ee9c33.493f7c",
+    "id": "f52145b6.00f26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 774.8833312988281,
-    "y": 301.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 816.5666656494141,
+    "y": 334.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4831915.5eaaa",
-        "7639e853.9511c8",
-        "a54eb7d5.3629"
+        "b781570d.1bdc6",
+        "a3b9d436.7cd37",
+        "916ad2e4.da3bd"
       ]
     ]
   },
   {
-    "id": "a4831915.5eaaa",
+    "id": "b781570d.1bdc6",
     "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": 1076.2168273925781,
-    "y": 572.8136291503906,
-    "z": "4456793a.59a288",
+    "x": 1117.900161743164,
+    "y": 605.4969635009766,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7639e853.9511c8",
+    "id": "a3b9d436.7cd37",
     "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": 1097.6452941894531,
-    "y": 275.2166442871094,
-    "z": "4456793a.59a288",
+    "x": 1139.328628540039,
+    "y": 307.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "46a7c921.f80be8",
-        "fa1c1252.bcac98",
-        "22347b09.105eec"
+        "a44b76d8.232f78",
+        "2fc87770.5a98b8",
+        "d48f40d3.37656"
       ]
     ]
   },
   {
-    "id": "46a7c921.f80be8",
+    "id": "a44b76d8.232f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1322.6452941894531,
-    "y": 133.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1364.328628540039,
+    "y": 165.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f818b9cf.ba44c"
+        "a9f7ac5b.dc2e28"
       ]
     ]
   },
   {
-    "id": "fa1c1252.bcac98",
+    "id": "2fc87770.5a98b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1318.1362609863281,
-    "y": 202.79067993164062,
-    "z": "4456793a.59a288",
+    "x": 1359.819595336914,
+    "y": 235.47401428222656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7ac2bf1b.1c3bb8"
+        "87351fcb.5849e"
       ]
     ]
   },
   {
-    "id": "22347b09.105eec",
+    "id": "d48f40d3.37656",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1306.6452941894531,
-    "y": 249.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1348.328628540039,
+    "y": 281.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9932a9c7.205738"
+        "81b461.b8b3eba"
       ]
     ]
   },
   {
-    "id": "3db9725e.eccbce",
+    "id": "ed4dfd16.f55a8",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1076.6452941894531,
-    "y": 163.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1118.328628540039,
+    "y": 195.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a54eb7d5.3629",
+    "id": "916ad2e4.da3bd",
     "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": 1064.6452941894531,
-    "y": 215.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1106.328628540039,
+    "y": 247.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f818b9cf.ba44c",
+    "id": "a9f7ac5b.dc2e28",
     "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": 1562.8833312988281,
-    "y": 129.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1604.566665649414,
+    "y": 162.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8e919d6f.673508",
-        "51e0925d.04913c"
+        "9413aaeb.d092f",
+        "4243f2e3.377954"
       ]
     ]
   },
   {
-    "id": "7ac2bf1b.1c3bb8",
+    "id": "87351fcb.5849e",
     "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": 1472.9457092285156,
-    "y": 205.74310302734375,
-    "z": "4456793a.59a288",
+    "x": 1514.6290435791016,
+    "y": 238.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9932a9c7.205738",
+    "id": "81b461.b8b3eba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1476.8833312988281,
-    "y": 249.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1518.566665649414,
+    "y": 282.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8e919d6f.673508",
+    "id": "9413aaeb.d092f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1767.8833312988281,
-    "y": 166.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1809.566665649414,
+    "y": 199.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "68453177.cb78b8"
+        "41ee935e.7af694"
       ]
     ]
   },
   {
-    "id": "51e0925d.04913c",
+    "id": "4243f2e3.377954",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.8833312988281,
-    "y": 93.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1819.566665649414,
+    "y": 126.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "68453177.cb78b8",
+    "id": "41ee935e.7af694",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1760.8833312988281,
-    "y": 241.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1802.566665649414,
+    "y": 274.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a82eb2b4.74145",
-        "2f11fd49.33bf4a",
-        "3f7479d2.cf6ebe",
-        "9bc906e5.702fc8",
-        "a8e7354f.a1833"
+        "48c9f8b7.accfc",
+        "4b70868c.ca77",
+        "33568fb6.bac76",
+        "ed1c5832.299138",
+        "629500a0.f350c"
       ]
     ]
   },
   {
-    "id": "c81e4e53.d33bf",
+    "id": "911385ff.dcfb6",
     "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": 2246.883331298828,
-    "y": 292.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2288.566665649414,
+    "y": 325.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "93e1f14a.5a9588",
-        "d05d8571.8f54d8",
-        "43bb6a89.efb504"
+        "7bf84f8a.19dac",
+        "e93a24fd.89bb98",
+        "b3019feb.2307b"
       ]
     ]
   },
   {
-    "id": "93e1f14a.5a9588",
+    "id": "7bf84f8a.19dac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2462.883331298828,
-    "y": 359.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2504.566665649414,
+    "y": 392.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "29fa3a31.28ab1e"
+        "28ff285d.675018"
       ]
     ]
   },
   {
-    "id": "d05d8571.8f54d8",
+    "id": "e93a24fd.89bb98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2463.374298095703,
-    "y": 259.4573059082031,
-    "z": "4456793a.59a288",
+    "x": 2505.057632446289,
+    "y": 292.14064025878906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9a07cfe7.b03588"
+        "4ef0e01e.f3cdf"
       ]
     ]
   },
   {
-    "id": "43bb6a89.efb504",
+    "id": "b3019feb.2307b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2458.883331298828,
-    "y": 308.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2500.566665649414,
+    "y": 341.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1a3ba46.e979e8"
+        "2913a1dc.ae6786"
       ]
     ]
   },
   {
-    "id": "a82eb2b4.74145",
+    "id": "48c9f8b7.accfc",
     "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": 1963.8833312988281,
-    "y": 273.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2005.566665649414,
+    "y": 306.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9e7211a2.fa3648",
-        "c81e4e53.d33bf",
-        "d050303.0f4a3d",
-        "c2f95f80.985fc"
+        "8b66b4b0.d208d8",
+        "911385ff.dcfb6",
+        "79257077.5f1ff8",
+        "8a55fb57.dfc438"
       ]
     ]
   },
   {
-    "id": "9e7211a2.fa3648",
+    "id": "8b66b4b0.d208d8",
     "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": 2243.883331298828,
-    "y": 211.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2285.566665649414,
+    "y": 244.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9bc906e5.702fc8",
+    "id": "ed1c5832.299138",
     "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",
     "comments": "",
-    "x": 1937.8833312988281,
-    "y": 223.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1979.566665649414,
+    "y": 256.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2f11fd49.33bf4a",
+    "id": "4b70868c.ca77",
     "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/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1980.8833312988281,
-    "y": 82.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2022.566665649414,
+    "y": 115.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f7479d2.cf6ebe",
+    "id": "33568fb6.bac76",
     "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/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1992.8833312988281,
-    "y": 123.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2034.566665649414,
+    "y": 156.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea819687.b3e55",
+    "id": "2a477cee.98364c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2017.8833312988281,
-    "y": 35.883331298828125,
-    "z": "4456793a.59a288",
+    "x": 2059.566665649414,
+    "y": 68.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a0a17876.3d9168",
+    "id": "11e969ea.04e966",
     "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": 1937.8833312988281,
-    "y": 169.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1979.566665649414,
+    "y": 202.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9a07cfe7.b03588",
+    "id": "4ef0e01e.f3cdf",
     "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": 2641.883331298828,
-    "y": 261.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2683.566665649414,
+    "y": 294.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b1a3ba46.e979e8",
+    "id": "2913a1dc.ae6786",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2641.820831298828,
-    "y": 311.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2683.504165649414,
+    "y": 343.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "29fa3a31.28ab1e",
+    "id": "28ff285d.675018",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2643.820831298828,
-    "y": 362.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2685.504165649414,
+    "y": 394.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ccdb352a.c0afb"
+        "ef99d74f.4057d"
       ]
     ]
   },
   {
-    "id": "ccdb352a.c0afb",
+    "id": "ef99d74f.4057d",
     "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": 2936.820831298828,
-    "y": 309.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2978.504165649414,
+    "y": 341.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d1c178.a002b69",
-        "a96469cb.c566d8",
-        "1d270f4d.7f92d9"
+        "e456d5f.a155828",
+        "7848fc63.19f06c",
+        "64a94fba.40e7a"
       ]
     ]
   },
   {
-    "id": "a96469cb.c566d8",
+    "id": "7848fc63.19f06c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3210.311798095703,
-    "y": 201.59756469726562,
-    "z": "4456793a.59a288",
+    "x": 3281.995101928711,
+    "y": 74.28089904785156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a9051800.9d7288"
+        "afcd1c40.b768f"
       ]
     ]
   },
   {
-    "id": "a9051800.9d7288",
+    "id": "afcd1c40.b768f",
     "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": 3387.883331298828,
-    "y": 201.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 3459.566635131836,
+    "y": 74.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1d270f4d.7f92d9",
+    "id": "64a94fba.40e7a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3205.820831298828,
-    "y": 251.02359008789062,
-    "z": "4456793a.59a288",
+    "x": 3277.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74b9715b.81c6"
+        "9649b9cd.238c78"
       ]
     ]
   },
   {
-    "id": "74b9715b.81c6",
+    "id": "9649b9cd.238c78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3387.820831298828,
-    "y": 251.02359008789062,
-    "z": "4456793a.59a288",
+    "x": 3459.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1d1c178.a002b69",
+    "id": "e456d5f.a155828",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3209.820831298828,
-    "y": 302.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 3281.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dea72b0a.7f4d98"
+        "8fd753ef.f9f648"
       ]
     ]
   },
   {
-    "id": "dea72b0a.7f4d98",
+    "id": "8fd753ef.f9f648",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3389.820831298828,
-    "y": 302.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 3461.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1a6bb71b.cc26c9"
+        "f37cd8dc.622f28"
       ]
     ]
   },
   {
-    "id": "1a6bb71b.cc26c9",
+    "id": "f37cd8dc.622f28",
     "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": 2955.883331298828,
-    "y": 436.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2997.566665649414,
+    "y": 469.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "24693fb2.e93b7",
-        "a9c05c16.6229b8"
+        "d8de60b.2b55ea",
+        "6b2e15a0.33589c"
       ]
     ]
   },
   {
-    "id": "a9c05c16.6229b8",
+    "id": "6b2e15a0.33589c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3265.883331298828,
-    "y": 443.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3337.566635131836,
+    "y": 316.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "24693fb2.e93b7",
+    "id": "d8de60b.2b55ea",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3264.883331298828,
-    "y": 497.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3336.566635131836,
+    "y": 370.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "54d9e040.3e5a2"
+        "41425976.6167f8"
       ]
     ]
   },
   {
-    "id": "7514cb1e.22b7cc",
+    "id": "d54e5594.aff43",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4009.883331298828,
-    "y": 451.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4081.566635131836,
+    "y": 324.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1a1e9340.1cb465"
+        "20569ac4.3ebdd6"
       ]
     ]
   },
   {
-    "id": "1a1e9340.1cb465",
+    "id": "20569ac4.3ebdd6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4186.883209228516,
-    "y": 444.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4258.566513061523,
+    "y": 317.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1cd3fabc.2c7055",
-        "df5b418a.0dd23"
+        "f7578f2.98aaff",
+        "fec27249.f43818"
       ]
     ]
   },
   {
-    "id": "54d9e040.3e5a2",
+    "id": "41425976.6167f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3428.883331298828,
-    "y": 423.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3500.566635131836,
+    "y": 296.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dde05d5d.d568e8",
-        "89905857.784518"
+        "bf1caed6.dba4d",
+        "7892547.06584ac"
       ]
     ]
   },
   {
-    "id": "dde05d5d.d568e8",
+    "id": "bf1caed6.dba4d",
     "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": 3709.883331298828,
-    "y": 379.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3781.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "abe51cd7.f8f208"
+        "37857fb8.f82a48"
       ]
     ]
   },
   {
-    "id": "abe51cd7.f8f208",
+    "id": "37857fb8.f82a48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3971.883331298828,
-    "y": 379.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4043.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7514cb1e.22b7cc"
+        "d54e5594.aff43"
       ]
     ]
   },
   {
-    "id": "1cd3fabc.2c7055",
+    "id": "f7578f2.98aaff",
     "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": 4429.883209228516,
-    "y": 401.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4501.566513061523,
+    "y": 274.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "df5b418a.0dd23",
+    "id": "fec27249.f43818",
     "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": 4418.883209228516,
-    "y": 456.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4490.566513061523,
+    "y": 329.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1c8bb90.0c2e78",
-        "2f32ddcf.c1426a",
-        "a81fdee7.10c348"
+        "7d11439b.9c402c",
+        "1159889c.e4b977",
+        "672fe755.7cac68"
       ]
     ]
   },
   {
-    "id": "a81fdee7.10c348",
+    "id": "672fe755.7cac68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4671.883331298828,
-    "y": 342.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4741.566879272461,
+    "y": 270.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "933dded8.905d48"
+        "8e6a85a9.42bd58"
       ]
     ]
   },
   {
-    "id": "933dded8.905d48",
+    "id": "8e6a85a9.42bd58",
     "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": 4820.454864501953,
-    "y": 343.1690979003906,
-    "z": "4456793a.59a288",
+    "x": 4890.138412475586,
+    "y": 270.85243225097656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4ff8891b.b27e6",
+    "id": "d22f2789.6a3cb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4819.392364501953,
-    "y": 387.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4889.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2f32ddcf.c1426a",
+    "id": "1159889c.e4b977",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4660.392364501953,
-    "y": 387.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4730.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4ff8891b.b27e6"
+        "d22f2789.6a3cb"
       ]
     ]
   },
   {
-    "id": "b1c8bb90.0c2e78",
+    "id": "7d11439b.9c402c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4667.392364501953,
-    "y": 466.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4737.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9b0431ef.52336"
+        "1927fc16.6351c4"
       ]
     ]
   },
   {
-    "id": "9b0431ef.52336",
+    "id": "1927fc16.6351c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4806.392364501953,
-    "y": 466.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4876.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "30420590.b9ff82",
-        "80a75b67.8413b8"
+        "4ec1a8d7.67b3c8",
+        "4af48fa4.c20fa"
       ]
     ]
   },
   {
-    "id": "30420590.b9ff82",
+    "id": "4ec1a8d7.67b3c8",
     "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": 5011.883331298828,
-    "y": 463.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5081.566879272461,
+    "y": 391.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "80a75b67.8413b8",
+    "id": "4af48fa4.c20fa",
     "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": 5010.883331298828,
-    "y": 509.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5080.566879272461,
+    "y": 437.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "89905857.784518",
+    "id": "7892547.06584ac",
     "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": 3526.883331298828,
-    "y": 495.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3598.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b46dcd3d.f4afe8"
+        "ea9b4d5b.2a42f8"
       ]
     ]
   },
   {
-    "id": "b46dcd3d.f4afe8",
+    "id": "ea9b4d5b.2a42f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3806.883331298828,
-    "y": 495.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3878.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f685aa80.8cfb4"
+        "476ea684.13443"
       ]
     ]
   },
   {
-    "id": "f685aa80.8cfb4",
+    "id": "476ea684.13443",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2219.8834533691406,
-    "y": 748.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 2261.5667877197266,
+    "y": 781.5667877197266,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a18b2354.2da15"
+        "c7ca0b2.bde93f8"
       ]
     ]
   },
   {
-    "id": "a18b2354.2da15",
+    "id": "c7ca0b2.bde93f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2396.883331298828,
-    "y": 741.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2438.566665649414,
+    "y": 774.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ea2df6b1.4ac208",
-        "5238e333.611ed4"
+        "86b11ccc.07eb1",
+        "5c684ea4.22866"
       ]
     ]
   },
   {
-    "id": "ea2df6b1.4ac208",
+    "id": "86b11ccc.07eb1",
     "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": 2639.883331298828,
-    "y": 698.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2681.566665649414,
+    "y": 731.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5238e333.611ed4",
+    "id": "5c684ea4.22866",
     "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": 2628.883331298828,
-    "y": 753.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2670.566665649414,
+    "y": 786.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d29bd2a6.f0278",
-        "aae66833.e493",
-        "51948363.691cec"
+        "2c2754a5.0b7c2c",
+        "9ab044d8.9332",
+        "6aa476a7.c1db08"
       ]
     ]
   },
   {
-    "id": "d29bd2a6.f0278",
+    "id": "2c2754a5.0b7c2c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2920.374298095703,
-    "y": 732.4573059082031,
-    "z": "4456793a.59a288",
+    "x": 2962.057632446289,
+    "y": 765.1406402587891,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a5baff8.5c15f"
+        "606104a3.7d17dc"
       ]
     ]
   },
   {
-    "id": "aae66833.e493",
+    "id": "9ab044d8.9332",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2908.883331298828,
-    "y": 776.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2950.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "590adc04.7c8c64"
+        "187a718c.4bcdf6"
       ]
     ]
   },
   {
-    "id": "a5baff8.5c15f",
+    "id": "606104a3.7d17dc",
     "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": 3068.945831298828,
-    "y": 732.7430725097656,
-    "z": "4456793a.59a288",
+    "x": 3110.629165649414,
+    "y": 765.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "590adc04.7c8c64",
+    "id": "187a718c.4bcdf6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3067.883331298828,
-    "y": 776.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3109.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "51948363.691cec",
+    "id": "6aa476a7.c1db08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2915.883331298828,
-    "y": 855.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2957.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "138db6d7.8d5031"
+        "9fd32ca0.d84048"
       ]
     ]
   },
   {
-    "id": "138db6d7.8d5031",
+    "id": "9fd32ca0.d84048",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3054.883331298828,
-    "y": 855.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3096.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7a4c5f2f.9027d8",
-        "f3e41369.61302",
-        "bb0c73ed.00d09",
-        "8e9b40a2.60b6c",
-        "bda9878c.43ffc8",
-        "746b18d4.be3d18",
-        "15698ad5.b40d3d",
-        "3d22a200.42e29e",
-        "ff1965cc.9c6318",
-        "a8011cb7.dd8288",
-        "60be6b60.c49e7c",
-        "77fe2bdc.eed0c4",
-        "c658e7ef.0b11d8",
-        "d48a24b6.db8ce8"
+        "7a7db7d4.95d8d",
+        "95e88e5b.59dc68",
+        "ccbad682.f9f6e",
+        "51c5f691.62046",
+        "c524ae07.05ca4",
+        "573995f0.c3e824",
+        "40c97410.34efdc",
+        "3ceacdf9.dad772",
+        "37ff3aef.9a54ee",
+        "a62852b2.29136",
+        "e4c9b14e.e493e",
+        "a5e91f89.51e28",
+        "6a1545ce.c6f074",
+        "fcc163b9.6d6e2",
+        "c9e93381.966988",
+        "5fc9799.82ba788",
+        "7ebd6769.0b5428",
+        "9fbb56ee.c43378",
+        "387e5bde.fd50e4",
+        "a78822a6.5321b",
+        "a4c94b0b.1b4718"
       ]
     ]
   },
   {
-    "id": "f45cdd5f.c90798",
+    "id": "8a5fb9f9.eee92",
     "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": 3368.883331298828,
-    "y": 661.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3445.566665649414,
+    "y": 422.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7a4c5f2f.9027d8",
+    "id": "7a7db7d4.95d8d",
     "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": 3349.883331298828,
-    "y": 711.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3426.566604614258,
+    "y": 501.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d48a24b6.db8ce8",
+    "id": "fcc163b9.6d6e2",
     "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": 3306.883331298828,
-    "y": 756.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3383.566604614258,
+    "y": 546.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f3e41369.61302",
+    "id": "95e88e5b.59dc68",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3281.883331298828,
-    "y": 819.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3348.566635131836,
+    "y": 600.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bb0c73ed.00d09",
+    "id": "ccbad682.f9f6e",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3282.883331298828,
-    "y": 874.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3349.566635131836,
+    "y": 655.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8e9b40a2.60b6c",
+    "id": "51c5f691.62046",
     "type": "save",
     "name": "get network-route-one 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-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3298.883331298828,
-    "y": 922.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3347.566635131836,
+    "y": 919.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5e527f7c.215cc8",
-        "e57980fe.5f9758",
-        "d6304ea1.fb76e"
+        "ab7d525c.39024",
+        "e9514e17.b4663",
+        "e95aa54a.0cb1c8"
       ]
     ]
   },
   {
-    "id": "bda9878c.43ffc8",
+    "id": "c524ae07.05ca4",
     "type": "save",
     "name": "get network-route-two 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-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3287.883331298828,
-    "y": 1009.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3342.566635131836,
+    "y": 980.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be8da30d.6c1bf8",
-        "59df3d01.4ec704",
-        "23f36ff9.6f46c"
+        "ba38cd77.3ddd8",
+        "3fe85825.5036d",
+        "4b77c928.b0503"
       ]
     ]
   },
   {
-    "id": "5e527f7c.215cc8",
+    "id": "ab7d525c.39024",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.883331298828,
-    "y": 806.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3658.566635131836,
+    "y": 690.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7280738b.1a48a4"
+        "a41dfa2.144c608"
       ]
     ]
   },
   {
-    "id": "e57980fe.5f9758",
+    "id": "e9514e17.b4663",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3495.392364501953,
-    "y": 856.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3654.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74f46c1.d313d14"
+        "88fea61b.80803"
       ]
     ]
   },
   {
-    "id": "d6304ea1.fb76e",
+    "id": "e95aa54a.0cb1c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.392364501953,
-    "y": 909.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3658.075668334961,
+    "y": 792.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f52b8ab.2e56cf"
+        "5f495b77.8e475c"
       ]
     ]
   },
   {
-    "id": "7280738b.1a48a4",
+    "id": "a41dfa2.144c608",
     "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": 3648.454864501953,
-    "y": 806.1690979003906,
-    "z": "4456793a.59a288",
+    "x": 3807.138168334961,
+    "y": 689.8524017333984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "74f46c1.d313d14",
+    "id": "88fea61b.80803",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3638.392364501953,
-    "y": 856.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3797.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "be8da30d.6c1bf8",
+    "id": "ba38cd77.3ddd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3510.883331298828,
-    "y": 979.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3620.566604614258,
+    "y": 880.5664825439453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4c2e6e70.a93be8"
+        "5d8c160b.0c4ea8"
       ]
     ]
   },
   {
-    "id": "59df3d01.4ec704",
+    "id": "3fe85825.5036d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.392364501953,
-    "y": 1029.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3616.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "25d04654.5e839a"
+        "b6433621.de36a"
       ]
     ]
   },
   {
-    "id": "23f36ff9.6f46c",
+    "id": "4b77c928.b0503",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.392364501953,
-    "y": 1082.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3617.075668334961,
+    "y": 975.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e7e2a18.77a626"
+        "999aafa8.043a8"
       ]
     ]
   },
   {
-    "id": "4c2e6e70.a93be8",
+    "id": "5d8c160b.0c4ea8",
     "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": 3659.454864501953,
-    "y": 979.1689758300781,
-    "z": "4456793a.59a288",
+    "x": 3769.138137817383,
+    "y": 879.8522491455078,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "25d04654.5e839a",
+    "id": "b6433621.de36a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3649.392364501953,
-    "y": 1029.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3759.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1f52b8ab.2e56cf",
+    "id": "5f495b77.8e475c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.883331298828,
-    "y": 908.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3819.566635131836,
+    "y": 792.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "37185a88.04a7d6"
+        "f4d50ce3.687d98"
       ]
     ]
   },
   {
-    "id": "e7e2a18.77a626",
+    "id": "999aafa8.043a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.883331298828,
-    "y": 1081.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3770.566635131836,
+    "y": 975.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2a90b49d.030114"
+        "6c0d4a32.4f3524"
       ]
     ]
   },
   {
-    "id": "37185a88.04a7d6",
+    "id": "f4d50ce3.687d98",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3832.883331298828,
-    "y": 908.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3994.566635131836,
+    "y": 766.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b7871daf.9b4e8",
-        "5be956df.30349"
+        "e8eddbb7.6cfbd",
+        "54846c0d.33a74c",
+        "b03ebc69.8e68d8"
       ]
     ]
   },
   {
-    "id": "2a90b49d.030114",
+    "id": "6c0d4a32.4f3524",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.883331298828,
-    "y": 1081.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3954.566635131836,
+    "y": 883.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7b05f3d6.ed8c14",
-        "ed6ce3d.aa0b8a"
+        "4f37a3d1.2e362c",
+        "efd815b8.8e6db8",
+        "65095290.735c7c"
       ]
     ]
   },
   {
-    "id": "b7871daf.9b4e8",
+    "id": "e8eddbb7.6cfbd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4008.883331298828,
-    "y": 887.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4116.566635131836,
+    "y": 551.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "52465f0e.0c996"
+        "c7edad0e.b216"
       ]
     ]
   },
   {
-    "id": "5be956df.30349",
+    "id": "54846c0d.33a74c",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 941.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4118.566635131836,
+    "y": 605.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "98cbb890.5e8b88"
+        "d5f61daa.4b4388"
       ]
     ]
   },
   {
-    "id": "7b05f3d6.ed8c14",
+    "id": "4f37a3d1.2e362c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4009.883331298828,
-    "y": 1051.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4135.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d0104e32.ac2ab8"
+        "81e90993.f1d9a8"
       ]
     ]
   },
   {
-    "id": "ed6ce3d.aa0b8a",
+    "id": "efd815b8.8e6db8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.883331298828,
-    "y": 1105.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4137.566665649414,
+    "y": 875.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8e259d5c.262c5"
+        "da2103e1.15169"
       ]
     ]
   },
   {
-    "id": "c68d1d99.71ec4",
+    "id": "f5d37541.2d47c8",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4318.883331298828,
-    "y": 839.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4426.566635131836,
+    "y": 503.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "97074ecd.08e3c8",
+    "id": "2bfe954c.51473a",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4311.883331298828,
-    "y": 937.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4419.566635131836,
+    "y": 601.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "be8be686.f85c68",
+    "id": "9391f162.46d07",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4311.883331298828,
-    "y": 1024.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4437.566665649414,
+    "y": 794.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3fa3de22.b5b33a",
+    "id": "8da0410.b4be6c",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4315.883331298828,
-    "y": 1117.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4441.566665649414,
+    "y": 887.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bd818350.b1a8a8",
+    "id": "c685a00a.7f3668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3542.883331298828,
-    "y": 1526.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3584.566665649414,
+    "y": 1559.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "56ff5ea8.b777"
+        "3e8c64de.c5d6ac"
       ]
     ]
   },
   {
-    "id": "ec755270.8f35e8",
+    "id": "c307eb50.c4efc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552.374298095703,
-    "y": 1569.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 3594.057632446289,
+    "y": 1602.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e382dfde.5b31d8"
+        "a457c21e.dc24c"
       ]
     ]
   },
   {
-    "id": "c9437d33.ef4e6",
+    "id": "fe413554.38fd68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.883331298828,
-    "y": 1615.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3582.566665649414,
+    "y": 1648.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f857e1e2.07be58"
+        "f7393df4.54a488"
       ]
     ]
   },
   {
-    "id": "5760f0e8.25dba",
+    "id": "940c17a9.af2df",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3242.883331298828,
-    "y": 1488.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3284.566665649414,
+    "y": 1521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "15698ad5.b40d3d",
+    "id": "40c97410.34efdc",
     "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": 3285.883331298828,
-    "y": 1553.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3327.566665649414,
+    "y": 1586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bd818350.b1a8a8",
-        "ec755270.8f35e8",
-        "c9437d33.ef4e6"
+        "c685a00a.7f3668",
+        "c307eb50.c4efc",
+        "fe413554.38fd68"
       ]
     ]
   },
   {
-    "id": "746b18d4.be3d18",
+    "id": "573995f0.c3e824",
     "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": 3286.883331298828,
-    "y": 1223.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3328.566665649414,
+    "y": 1256.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "16a316bf.36aa51",
-        "5dc43b13.af0e5c"
+        "ce053797.967e5",
+        "1d8318a4.118f1f"
       ]
     ]
   },
   {
-    "id": "5dc43b13.af0e5c",
+    "id": "1d8318a4.118f1f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.883331298828,
-    "y": 1209.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3549.566635131836,
+    "y": 1309.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4015e76.5fd6098"
+        "d7acba72.b8d088"
       ]
     ]
   },
   {
-    "id": "16a316bf.36aa51",
+    "id": "ce053797.967e5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.883331298828,
-    "y": 1242.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3551.566635131836,
+    "y": 1342.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f3f89c52.21e5b8"
+        "b936608f.415c9"
       ]
     ]
   },
   {
-    "id": "56ff5ea8.b777",
+    "id": "3e8c64de.c5d6ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3715.549835205078,
-    "y": 1525.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3757.233169555664,
+    "y": 1558.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "286978b9.608f5",
-        "e1e71113.50d348"
+        "61a62886.979d9",
+        "69747a1f.4d36a4"
       ]
     ]
   },
   {
-    "id": "e382dfde.5b31d8",
+    "id": "a457c21e.dc24c",
     "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": 3705.9457092285156,
-    "y": 1572.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 3747.6290435791016,
+    "y": 1605.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f857e1e2.07be58",
+    "id": "f7393df4.54a488",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3709.883331298828,
-    "y": 1616.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3751.566665649414,
+    "y": 1649.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "286978b9.608f5",
+    "id": "61a62886.979d9",
     "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": 3979.883331298828,
-    "y": 1509.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4021.566665649414,
+    "y": 1542.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5b0e63ee.a3ecd4",
-        "22c0e5a9.26fd0a"
+        "d27c3919.e4f1e8",
+        "744ce69a.cd2cd"
       ]
     ]
   },
   {
-    "id": "22c0e5a9.26fd0a",
+    "id": "744ce69a.cd2cd",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4202.883331298828,
-    "y": 1464.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4244.566665649414,
+    "y": 1497.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bad02ed0.d565e8"
+        "d24d75df.899958"
       ]
     ]
   },
   {
-    "id": "5b0e63ee.a3ecd4",
+    "id": "d27c3919.e4f1e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4204.883331298828,
-    "y": 1528.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4246.566665649414,
+    "y": 1561.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cba8e08.e7cb12"
+        "195cae09.6a270a"
       ]
     ]
   },
   {
-    "id": "cba8e08.e7cb12",
+    "id": "195cae09.6a270a",
     "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": 4366.883331298828,
-    "y": 1524.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4408.566665649414,
+    "y": 1557.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bad02ed0.d565e8",
+    "id": "d24d75df.899958",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4367.883331298828,
-    "y": 1461.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4409.566665649414,
+    "y": 1494.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "14c7dbb3.7bb934",
-        "ad8d4f98.026b1"
+        "64761578.742944",
+        "545ae19b.2a1238"
       ]
     ]
   },
   {
-    "id": "b0538c9f.9cd51",
-    "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": 3981.883331298828,
-    "y": 1668.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4ca2f9ab.45ab7",
-    "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": 4026.883331298828,
-    "y": 1578.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ecb8fc16.8423f8",
-    "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": 4109.883331298828,
-    "y": 1716.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f3f89c52.21e5b8",
+    "id": "b936608f.415c9",
     "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": 3654.883331298828,
-    "y": 1239.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3694.566635131836,
+    "y": 1339.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4015e76.5fd6098",
+    "id": "d7acba72.b8d088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3657.883331298828,
-    "y": 1202.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3697.566635131836,
+    "y": 1302.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ebd7b0f3.96fde8",
-        "1cc07a61.1b7696"
+        "66afead4.578fec",
+        "d914a00d.43d42"
       ]
     ]
   },
   {
-    "id": "ebd7b0f3.96fde8",
+    "id": "66afead4.578fec",
     "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": 3831.883331298828,
-    "y": 1158.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3871.566635131836,
+    "y": 1258.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e1e71113.50d348",
+    "id": "69747a1f.4d36a4",
     "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": 3933.883331298828,
-    "y": 1793.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3970.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc68df19.413ab"
+        "6692ad9d.63a244"
       ]
     ]
   },
   {
-    "id": "bc68df19.413ab",
+    "id": "6692ad9d.63a244",
     "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": 4139.883331298828,
-    "y": 1793.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4176.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "50ca2971.ea36d8"
+        "efeaf290.376e48"
       ]
     ]
   },
   {
-    "id": "50ca2971.ea36d8",
+    "id": "efeaf290.376e48",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4355.168975830078,
-    "y": 1793.7051086425781,
-    "z": "4456793a.59a288",
+    "x": 4391.852279663086,
+    "y": 1652.388412475586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9aafd9b7.eaf6"
+        "9388038d.e5f508"
       ]
     ]
   },
   {
-    "id": "1cc07a61.1b7696",
+    "id": "d914a00d.43d42",
     "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": 3846.883331298828,
-    "y": 1269.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3886.566635131836,
+    "y": 1369.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "502e27f2.360128",
-        "613a0c37.ee93fc",
-        "15983fe1.c65378"
+        "3150a2ed.678f16",
+        "5769f8b6.da962",
+        "c8b63edf.598bb8"
       ]
     ]
   },
   {
-    "id": "502e27f2.360128",
+    "id": "3150a2ed.678f16",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.3834533691406,
-    "y": 1221.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4082.0667572021484,
+    "y": 1321.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ab759fb6.dae2a8"
+        "47f6939a.0cca7c"
       ]
     ]
   },
   {
-    "id": "613a0c37.ee93fc",
+    "id": "5769f8b6.da962",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.3834533691406,
-    "y": 1276.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4074.0667572021484,
+    "y": 1376.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc752416.e0cbc"
+        "dfce5624.4d0e8"
       ]
     ]
   },
   {
-    "id": "15983fe1.c65378",
+    "id": "c8b63edf.598bb8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4039.3834533691406,
-    "y": 1333.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4079.0667572021484,
+    "y": 1433.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9670670b.649c48"
+        "16d53904.a69817"
       ]
     ]
   },
   {
-    "id": "9670670b.649c48",
+    "id": "16d53904.a69817",
     "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": 4191.383453369141,
-    "y": 1334.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4231.066757202148,
+    "y": 1434.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bc752416.e0cbc",
+    "id": "dfce5624.4d0e8",
     "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": 4202.383453369141,
-    "y": 1279.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4242.066757202148,
+    "y": 1379.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ab759fb6.dae2a8",
+    "id": "47f6939a.0cca7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4186.765777587891,
-    "y": 1219.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 4226.449081420898,
+    "y": 1319.2223052978516,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fbc120c8.3124d8"
+        "57719ed2.829e5"
       ]
     ]
   },
   {
-    "id": "fbc120c8.3124d8",
+    "id": "57719ed2.829e5",
     "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": 4370.883331298828,
-    "y": 1233.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4410.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "df89787f.a5a578"
+        "8b55301b.b943a8"
       ]
     ]
   },
   {
-    "id": "ad8d4f98.026b1",
+    "id": "545ae19b.2a1238",
     "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": 4537.883331298828,
-    "y": 1419.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4579.566665649414,
+    "y": 1452.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "14c7dbb3.7bb934",
+    "id": "64761578.742944",
     "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": 4538.883331298828,
-    "y": 1527.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4580.566665649414,
+    "y": 1560.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "832f55b4.d525f",
+    "id": "3bbb3a78.1e825e",
     "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": 4539.883331298828,
-    "y": 1476.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4581.566665649414,
+    "y": 1509.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9aafd9b7.eaf6",
+    "id": "9388038d.e5f508",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.000518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4598.683822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f4bf2a88.8e07c8",
-        "84226d1d.c53f58",
-        "5135c34e.c2878c"
+        "13805827.ade3d",
+        "a9502d93.1e2b78",
+        "a1b1941b.f9c738"
       ]
     ]
   },
   {
-    "id": "f4bf2a88.8e07c8",
+    "id": "13805827.ade3d",
     "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": 4777.000518798828,
-    "y": 1756.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4813.683822631836,
+    "y": 1614.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "84226d1d.c53f58",
+    "id": "a9502d93.1e2b78",
     "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": 4774.000518798828,
-    "y": 1795.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4810.683822631836,
+    "y": 1653.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d44e19c.6d7318"
+        "b0dee9b7.4f5918"
       ]
     ]
   },
   {
-    "id": "5135c34e.c2878c",
+    "id": "a1b1941b.f9c738",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.500518798828,
-    "y": 1837.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4766.183822631836,
+    "y": 1695.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d44e19c.6d7318",
+    "id": "b0dee9b7.4f5918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4991.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "29687f0b.c77f5"
+        "915aa3e1.c4697"
       ]
     ]
   },
   {
-    "id": "a2ec001d.4a7fb8",
+    "id": "25f4a2bf.12e7a6",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4768.883331298828,
-    "y": 1237.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4810.566665649414,
+    "y": 1270.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6f5c9a68.97563c"
+        "5118de9a.01dd88"
       ]
     ]
   },
   {
-    "id": "6f5c9a68.97563c",
+    "id": "5118de9a.01dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4945.883331298828,
-    "y": 1229.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4987.566665649414,
+    "y": 1262.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7ae681af.873ac8",
-        "9549ff73.9a1cc8"
+        "94a9a0f9.c59e58",
+        "85408268.2c3368"
       ]
     ]
   },
   {
-    "id": "df89787f.a5a578",
+    "id": "8b55301b.b943a8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.883331298828,
-    "y": 1233.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4605.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a2ec001d.4a7fb8",
-        "bc76afd9.40381"
+        "25f4a2bf.12e7a6",
+        "95e8d812.cc8ca8"
       ]
     ]
   },
   {
-    "id": "bc76afd9.40381",
+    "id": "95e8d812.cc8ca8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4771.883331298828,
-    "y": 1311.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4813.566665649414,
+    "y": 1344.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1ac8b93a.8f9647"
+        "f38eef5.12b7d1"
       ]
     ]
   },
   {
-    "id": "1ac8b93a.8f9647",
+    "id": "f38eef5.12b7d1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4948.883331298828,
-    "y": 1303.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4990.566665649414,
+    "y": 1336.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "12ac39b2.69f38e"
+        "c816565f.10d5d"
       ]
     ]
   },
   {
-    "id": "29687f0b.c77f5",
+    "id": "915aa3e1.c4697",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 5149.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6aef1ca3.67a3dc"
+        "6c003d6.b17f944"
       ]
     ]
   },
   {
-    "id": "6aef1ca3.67a3dc",
+    "id": "6c003d6.b17f944",
     "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": 5319.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 5356.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9549ff73.9a1cc8",
+    "id": "85408268.2c3368",
     "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": 5153.883331298828,
-    "y": 1236.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5195.566665649414,
+    "y": 1269.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1ca68d2c.42a1b3",
-        "79238f45.d528a",
-        "b580a25b.41384"
+        "53b236d8.1b02c",
+        "4083b24b.fff034",
+        "39446af.e663d96"
       ]
     ]
   },
   {
-    "id": "7ae681af.873ac8",
+    "id": "94a9a0f9.c59e58",
     "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": 5183.883331298828,
-    "y": 1184.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5225.566665649414,
+    "y": 1217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1ca68d2c.42a1b3",
+    "id": "53b236d8.1b02c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5363.883331298828,
-    "y": 1227.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5405.566665649414,
+    "y": 1260.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1cf65ad.e3b2e25"
+        "85a67c1c.71be78"
       ]
     ]
   },
   {
-    "id": "79238f45.d528a",
+    "id": "4083b24b.fff034",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5355.883331298828,
-    "y": 1282.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5397.566665649414,
+    "y": 1315.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "55debd4.7dcf144"
+        "ef1cd568.ee18"
       ]
     ]
   },
   {
-    "id": "b580a25b.41384",
+    "id": "39446af.e663d96",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5360.883331298828,
-    "y": 1339.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5402.566665649414,
+    "y": 1372.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "277b43ae.d3d8bc"
+        "9b4ff565.a53cd"
       ]
     ]
   },
   {
-    "id": "277b43ae.d3d8bc",
+    "id": "9b4ff565.a53cd",
     "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": 5512.883331298828,
-    "y": 1340.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5554.566665649414,
+    "y": 1373.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "55debd4.7dcf144",
+    "id": "ef1cd568.ee18",
     "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": 5523.883331298828,
-    "y": 1285.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5565.566665649414,
+    "y": 1318.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1cf65ad.e3b2e25",
+    "id": "85a67c1c.71be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5508.265655517578,
-    "y": 1225.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 5549.948989868164,
+    "y": 1258.2223358154297,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "293b0137.5d1d8e"
+        "53e9aeb2.242928"
       ]
     ]
   },
   {
-    "id": "12ac39b2.69f38e",
+    "id": "c816565f.10d5d",
     "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": 5183.883331298828,
-    "y": 1427.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5225.566665649414,
+    "y": 1460.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "293b0137.5d1d8e",
+    "id": "53e9aeb2.242928",
     "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": 5722.883331298828,
-    "y": 1221.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5764.566665649414,
+    "y": 1254.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f12c4ac3.acc2d",
+    "id": "bd4af2f9.e804e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4306.883331298828,
-    "y": 875.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4414.566635131836,
+    "y": 539.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "23d5a8e8.6a48d8",
+    "id": "ff102e0b.75a238",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4297.883331298828,
-    "y": 973.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4405.566635131836,
+    "y": 637.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "52465f0e.0c996",
+    "id": "c7edad0e.b216",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4131.883331298828,
-    "y": 881.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4239.566635131836,
+    "y": 545.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c68d1d99.71ec4",
-        "f12c4ac3.acc2d"
+        "f5d37541.2d47c8",
+        "bd4af2f9.e804e"
       ]
     ]
   },
   {
-    "id": "98cbb890.5e8b88",
+    "id": "d5f61daa.4b4388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4137.883331298828,
-    "y": 945.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4245.566635131836,
+    "y": 609.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "97074ecd.08e3c8",
-        "23d5a8e8.6a48d8"
+        "2bfe954c.51473a",
+        "ff102e0b.75a238"
       ]
     ]
   },
   {
-    "id": "d0104e32.ac2ab8",
+    "id": "81e90993.f1d9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4137.883331298828,
-    "y": 1051.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4263.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be8be686.f85c68",
-        "e50dfba7.f60328"
+        "9391f162.46d07",
+        "cb81a4f3.d6156"
       ]
     ]
   },
   {
-    "id": "8e259d5c.262c5",
+    "id": "da2103e1.15169",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.883331298828,
-    "y": 1104.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4266.566665649414,
+    "y": 874.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3fa3de22.b5b33a",
-        "6c2da806.3569b"
+        "8da0410.b4be6c",
+        "e6103926.96cb88"
       ]
     ]
   },
   {
-    "id": "e50dfba7.f60328",
+    "id": "cb81a4f3.d6156",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4297.883331298828,
-    "y": 1064.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4423.566665649414,
+    "y": 834.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6c2da806.3569b",
+    "id": "e6103926.96cb88",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4300.883331298828,
-    "y": 1155.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4426.566665649414,
+    "y": 925.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b9324a20.74a63",
+    "id": "9fb68dad.7c92d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.883331298828,
-    "y": 2365.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3718.566635131836,
+    "y": 2052.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f10be91.1b09d98",
-        "d09bd461.c7ba88"
+        "931d0e50.a84728",
+        "4385be6.d4f41c"
       ]
     ]
   },
   {
-    "id": "56bce95e.90bfe",
+    "id": "62a0ff40.3fa718",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.216827392578,
-    "y": 2366.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3545.900131225586,
+    "y": 2053.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b9324a20.74a63"
+        "9fb68dad.7c92d"
       ]
     ]
   },
   {
-    "id": "aea1bf99.8fdcc",
+    "id": "a9db3cf5.8c98a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.707794189453,
-    "y": 2409.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 3555.391098022461,
+    "y": 2096.140670776367,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "29a46b5c.88b5bc"
+        "b1d5af05.b8b6a"
       ]
     ]
   },
   {
-    "id": "87e0206.8796c6",
+    "id": "e64b0ffd.d5764",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3498.216827392578,
-    "y": 2455.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3543.900131225586,
+    "y": 2142.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d955e57.2601ca"
+        "c5461a06.0ba95"
       ]
     ]
   },
   {
-    "id": "29a46b5c.88b5bc",
+    "id": "b1d5af05.b8b6a",
     "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": 3663.2792053222656,
-    "y": 2412.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 3708.9625091552734,
+    "y": 2099.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1d955e57.2601ca",
+    "id": "c5461a06.0ba95",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3667.216827392578,
-    "y": 2456.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3712.900131225586,
+    "y": 2143.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f10be91.1b09d98",
+    "id": "931d0e50.a84728",
     "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": 3959.216827392578,
-    "y": 2369.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4004.900131225586,
+    "y": 2056.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fda7c536.3acee",
-        "c79b96a2.97ef58"
+        "ff2f7e35.94528",
+        "ccece71a.073de8"
       ]
     ]
   },
   {
-    "id": "c79b96a2.97ef58",
+    "id": "ccece71a.073de8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4182.216827392578,
-    "y": 2324.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4227.900131225586,
+    "y": 2011.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "81ad908f.6a16e"
+        "c18c40eb.b59cb8"
       ]
     ]
   },
   {
-    "id": "fda7c536.3acee",
+    "id": "ff2f7e35.94528",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4184.216827392578,
-    "y": 2388.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4229.900131225586,
+    "y": 2075.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e8b14d91.9e5c88"
+        "a47e6ec9.683da"
       ]
     ]
   },
   {
-    "id": "e8b14d91.9e5c88",
+    "id": "a47e6ec9.683da",
     "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": 4343.216827392578,
-    "y": 2407.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4388.900131225586,
+    "y": 2094.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "81ad908f.6a16e",
+    "id": "c18c40eb.b59cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4347.216827392578,
-    "y": 2321.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4392.900131225586,
+    "y": 2008.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cad9326b.b2da",
-        "3eb5f127.732d1e"
+        "50191e6c.286e58",
+        "e564295c.7502a8"
       ]
     ]
   },
   {
-    "id": "cf8b334d.12d69",
-    "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": 3961.216827392578,
-    "y": 2528.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a51bfc6c.2ab4b",
-    "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": 4006.216827392578,
-    "y": 2438.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5d70457e.e444e4",
-    "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": 4088.216827392578,
-    "y": 2593.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ff1965cc.9c6318",
+    "id": "37ff3aef.9a54ee",
     "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": 3272.216827392578,
-    "y": 2401.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3317.900131225586,
+    "y": 2088.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "56bce95e.90bfe",
-        "aea1bf99.8fdcc",
-        "87e0206.8796c6"
+        "62a0ff40.3fa718",
+        "a9db3cf5.8c98a8",
+        "e64b0ffd.d5764"
       ]
     ]
   },
   {
-    "id": "e04ad761.fdc11",
+    "id": "e2a5ba2c.d267c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3233.216827392578,
-    "y": 2345.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3278.900131225586,
+    "y": 2032.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3d22a200.42e29e",
+    "id": "3ceacdf9.dad772",
     "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": 3290.216827392578,
-    "y": 2064.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3337.900131225586,
+    "y": 1828.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f0778891.f400f",
-        "2be980fe.83d6b8"
+        "fc191473.db2cb8",
+        "44d4fd2b.8896cc"
       ]
     ]
   },
   {
-    "id": "2be980fe.83d6b8",
+    "id": "44d4fd2b.8896cc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.216827392578,
-    "y": 2050.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3560.900131225586,
+    "y": 1814.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1ec9f8d.bab6807"
+        "e4dd083d.cd18f8"
       ]
     ]
   },
   {
-    "id": "f0778891.f400f",
+    "id": "fc191473.db2cb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.216827392578,
-    "y": 2083.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3562.900131225586,
+    "y": 1847.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "45edb459.c45c8c"
+        "28eac456.f04cbc"
       ]
     ]
   },
   {
-    "id": "45edb459.c45c8c",
+    "id": "28eac456.f04cbc",
     "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": 3658.216827392578,
-    "y": 2080.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3705.900131225586,
+    "y": 1844.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1ec9f8d.bab6807",
+    "id": "e4dd083d.cd18f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3661.216827392578,
-    "y": 2043.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3708.900131225586,
+    "y": 1807.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8bf99b8b.4af368",
-        "57c842ba.83379c"
+        "c8368cdf.b15f18",
+        "26325ab5.37c516"
       ]
     ]
   },
   {
-    "id": "8bf99b8b.4af368",
+    "id": "c8368cdf.b15f18",
     "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": 3855.216827392578,
-    "y": 2046.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3902.900131225586,
+    "y": 1810.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d09bd461.c7ba88",
+    "id": "4385be6.d4f41c",
     "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": 3918.216827392578,
-    "y": 2678.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3955.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "adbd165.7c69a68"
+        "ab5afaa2.b8a2e"
       ]
     ]
   },
   {
-    "id": "adbd165.7c69a68",
+    "id": "ab5afaa2.b8a2e",
     "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": 4124.216827392578,
-    "y": 2678.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4161.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9b58a38.dc3806"
+        "8b90a37d.df48a8"
       ]
     ]
   },
   {
-    "id": "9b58a38.dc3806",
+    "id": "8b90a37d.df48a8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4341.502471923828,
-    "y": 2677.705108642578,
-    "z": "4456793a.59a288",
+    "x": 4379.185745239258,
+    "y": 2178.388381958008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ec0e6199.3c529"
+        "9497250f.2d9438"
       ]
     ]
   },
   {
-    "id": "57c842ba.83379c",
+    "id": "26325ab5.37c516",
     "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": 3877.216827392578,
-    "y": 2114.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3924.900131225586,
+    "y": 1878.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34626e8a.0bbe1a",
-        "390dcffe.f00898",
-        "4d1fe4fe.2890ec"
+        "572475c6.9df474",
+        "8a4bcee9.a6e838",
+        "52414e68.698aa8"
       ]
     ]
   },
   {
-    "id": "34626e8a.0bbe1a",
+    "id": "572475c6.9df474",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.7169494628906,
-    "y": 2066.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4120.400253295898,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "95be6ff8.bea0e"
+        "cc04a6ba.577058"
       ]
     ]
   },
   {
-    "id": "390dcffe.f00898",
+    "id": "8a4bcee9.a6e838",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4064.7169494628906,
-    "y": 2121.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4112.400253295898,
+    "y": 1885.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "46312f08.59959"
+        "5bcad340.b7a94c"
       ]
     ]
   },
   {
-    "id": "4d1fe4fe.2890ec",
+    "id": "52414e68.698aa8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4069.7169494628906,
-    "y": 2178.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4117.400253295898,
+    "y": 1942.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "15450853.01aa88"
+        "78c91f5c.6a81a"
       ]
     ]
   },
   {
-    "id": "15450853.01aa88",
+    "id": "78c91f5c.6a81a",
     "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": 4221.716949462891,
-    "y": 2179.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4269.400253295898,
+    "y": 1943.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "46312f08.59959",
+    "id": "5bcad340.b7a94c",
     "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": 4232.716949462891,
-    "y": 2124.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4280.400253295898,
+    "y": 1888.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "95be6ff8.bea0e",
+    "id": "cc04a6ba.577058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4217.099273681641,
-    "y": 2064.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 4264.782577514648,
+    "y": 1828.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "691678af.c2875"
+        "b056f70a.5ef0e"
       ]
     ]
   },
   {
-    "id": "cad9326b.b2da",
+    "id": "50191e6c.286e58",
     "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": 4517.216827392578,
-    "y": 2282.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4562.900131225586,
+    "y": 1969.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3eb5f127.732d1e",
+    "id": "e564295c.7502a8",
     "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": 4518.216827392578,
-    "y": 2387.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4563.900131225586,
+    "y": 2074.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bf01d807.ca2a6",
+    "id": "4a5f1f34.b170c",
     "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": 4513.216827392578,
-    "y": 2336.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4558.900131225586,
+    "y": 2023.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ec0e6199.3c529",
+    "id": "9497250f.2d9438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4548.334014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4586.017288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "310c30a2.98cdd8",
-        "f852afcd.3e249",
-        "77117052.72541"
+        "dc5203d6.63ee88",
+        "bfaf928b.d789b",
+        "75ef4dfa.4963fc"
       ]
     ]
   },
   {
-    "id": "310c30a2.98cdd8",
+    "id": "dc5203d6.63ee88",
     "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": 4763.334014892578,
-    "y": 2629.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4801.017288208008,
+    "y": 2129.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f852afcd.3e249",
+    "id": "bfaf928b.d789b",
     "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": 4760.334014892578,
-    "y": 2668.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4798.017288208008,
+    "y": 2168.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8dd58be1.de6918"
+        "6dd4b7bc.60078"
       ]
     ]
   },
   {
-    "id": "77117052.72541",
+    "id": "75ef4dfa.4963fc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4715.834014892578,
-    "y": 2710.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4753.517288208008,
+    "y": 2210.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8dd58be1.de6918",
+    "id": "6dd4b7bc.60078",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4940.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4978.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bf6de4b9.07a8d8"
+        "f825fb77.fb7bc8"
       ]
     ]
   },
   {
-    "id": "bf6de4b9.07a8d8",
+    "id": "f825fb77.fb7bc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5098.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 5136.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4337b0b8.5fd258"
+        "aa2ab587.72eca"
       ]
     ]
   },
   {
-    "id": "4337b0b8.5fd258",
+    "id": "aa2ab587.72eca",
     "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": 5305.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 5343.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "290c1291.0be836",
+    "id": "5ec77bbd.698654",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4799.216827392578,
-    "y": 2082.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4846.900131225586,
+    "y": 1846.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4a42d224.6e916c"
+        "ef66532c.d6746"
       ]
     ]
   },
   {
-    "id": "4a42d224.6e916c",
+    "id": "ef66532c.d6746",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4976.216827392578,
-    "y": 2074.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5023.900131225586,
+    "y": 1838.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "44500a36.8314c4",
-        "edf4775.6feec88"
+        "f7a2f11b.7a291",
+        "d2b30e12.01e548"
       ]
     ]
   },
   {
-    "id": "691678af.c2875",
+    "id": "b056f70a.5ef0e",
     "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": 4401.216827392578,
-    "y": 2078.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4448.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e26ac43.7b22838"
+        "658c9b9.fce64e4"
       ]
     ]
   },
   {
-    "id": "e26ac43.7b22838",
+    "id": "658c9b9.fce64e4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4596.216827392578,
-    "y": 2078.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4643.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "290c1291.0be836",
-        "91efe90a.a989f"
+        "5ec77bbd.698654",
+        "d91be682.fd9ed8"
       ]
     ]
   },
   {
-    "id": "edf4775.6feec88",
+    "id": "d2b30e12.01e548",
     "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": 5184.216827392578,
-    "y": 2081.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5231.900131225586,
+    "y": 1845.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ccc8d651.608a58",
-        "4c1a6f18.7cad4",
-        "d7a69532.21f81"
+        "5cd3941f.991a64",
+        "72be6080.49369",
+        "27b21fad.3c3a98"
       ]
     ]
   },
   {
-    "id": "1e83e9df.5f1ca6",
+    "id": "a895224b.6a3d58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4978.216827392578,
-    "y": 2147.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5025.900131225586,
+    "y": 1911.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "36af6584.4e4842"
+        "de5c0fa7.2ddfe8"
       ]
     ]
   },
   {
-    "id": "91efe90a.a989f",
+    "id": "d91be682.fd9ed8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4801.216827392578,
-    "y": 2155.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4848.900131225586,
+    "y": 1919.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1e83e9df.5f1ca6"
+        "a895224b.6a3d58"
       ]
     ]
   },
   {
-    "id": "44500a36.8314c4",
+    "id": "f7a2f11b.7a291",
     "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": 5214.216827392578,
-    "y": 2029.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5261.900131225586,
+    "y": 1793.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "36af6584.4e4842",
+    "id": "de5c0fa7.2ddfe8",
     "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": 5213.216827392578,
-    "y": 2271.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5260.900131225586,
+    "y": 2035.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ccc8d651.608a58",
+    "id": "5cd3941f.991a64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.216827392578,
-    "y": 2072.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5441.900131225586,
+    "y": 1836.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "39681472.975784"
+        "2d963acb.7812d6"
       ]
     ]
   },
   {
-    "id": "4c1a6f18.7cad4",
+    "id": "72be6080.49369",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5386.216827392578,
-    "y": 2127.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5433.900131225586,
+    "y": 1891.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc7c4cb6.e261e8"
+        "7809e6f0.3ba7a"
       ]
     ]
   },
   {
-    "id": "d7a69532.21f81",
+    "id": "27b21fad.3c3a98",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5391.216827392578,
-    "y": 2184.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5438.900131225586,
+    "y": 1948.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "10a038dd.f22947"
+        "76fc1345.ebf534"
       ]
     ]
   },
   {
-    "id": "10a038dd.f22947",
+    "id": "76fc1345.ebf534",
     "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": 5543.216827392578,
-    "y": 2185.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5590.900131225586,
+    "y": 1949.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bc7c4cb6.e261e8",
+    "id": "7809e6f0.3ba7a",
     "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": 5554.216827392578,
-    "y": 2130.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5601.900131225586,
+    "y": 1894.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "39681472.975784",
+    "id": "2d963acb.7812d6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5538.599151611328,
-    "y": 2070.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 5586.282455444336,
+    "y": 1834.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "19f3508c.df2467"
+        "3e96d581.6be972"
       ]
     ]
   },
   {
-    "id": "19f3508c.df2467",
+    "id": "3e96d581.6be972",
     "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": 5753.216827392578,
-    "y": 2066.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5800.900131225586,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a8011cb7.dd8288",
+    "id": "a62852b2.29136",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' 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\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3251.883331298828,
-    "y": 1676.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3285.566635131836,
+    "y": 1649.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "48c20a24.e1d944",
+    "id": "906a6d5d.cfc198",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4473.883331298828,
-    "y": 959.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4581.566635131836,
+    "y": 623.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "33f8c668.c00922",
+    "id": "c5fcfc8e.70af78",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4465.883331298828,
-    "y": 1049.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4591.566665649414,
+    "y": 819.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "60be6b60.c49e7c",
+    "id": "e4c9b14e.e493e",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' 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\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3232.883331298828,
-    "y": 2532.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3288.566604614258,
+    "y": 2157.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "77fe2bdc.eed0c4",
+    "id": "a5e91f89.51e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3383.883331298828,
-    "y": 2780.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3425.566665649414,
+    "y": 2813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c658e7ef.0b11d8",
+    "id": "6a1545ce.c6f074",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3260.883331298828,
-    "y": 2890.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3302.566665649414,
+    "y": 2923.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5eb047e9.2f7668",
-        "a0bb1c61.b88728"
+        "2a58524.cf6ab2e",
+        "b22f43e3.b228e"
       ]
     ]
   },
   {
-    "id": "5eb047e9.2f7668",
+    "id": "2a58524.cf6ab2e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.883331298828,
-    "y": 2869.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3486.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fb1841e2.6264"
+        "1fd47368.eaee3d"
       ]
     ]
   },
   {
-    "id": "a0bb1c61.b88728",
+    "id": "b22f43e3.b228e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3336.883331298828,
-    "y": 5047.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3378.566665649414,
+    "y": 5080.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4d88182e.2579a"
+        "bb1800d1.b22838"
       ]
     ]
   },
   {
-    "id": "4d88182e.2579a",
+    "id": "bb1800d1.b22838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3491.883331298828,
-    "y": 5040.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3533.566665649414,
+    "y": 5073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "44d48088.590d78",
-        "a2dd9c19.75287",
-        "906b118c.b5ca4",
-        "80cc4c1e.a6bfe",
-        "3d1de5ec.2ac45a"
+        "eb692208.605d48",
+        "fa1a129b.8e1e58",
+        "8f8ab353.277fd8",
+        "e967635e.d5f898",
+        "a7e951fd.34174",
+        "147222b6.72d4a5"
       ]
     ]
   },
   {
-    "id": "fb1841e2.6264",
+    "id": "1fd47368.eaee3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3587.883331298828,
-    "y": 2869.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3629.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e6eab534.0772a8",
-        "b10b9835.71fc5",
-        "9c84ab4f.a1a008",
-        "50925bce.958aec",
-        "eab645cb.c973",
-        "74310cc1.794b3c",
-        "b442de01.03d108",
-        "a559e6ec.97fea8",
-        "c65cb0db.1db578",
-        "c0792f26.4d13b8",
-        "e82ea719.e6f068",
-        "c4a1bace.0d4bb",
-        "8f561f42.000fe8",
-        "aa738c85.1c137",
-        "54d18bcb.0986c4",
-        "4494cc45.3ce764",
-        "b937ed07.a77618",
-        "d5c180c8.9f0b08",
-        "123d53b6.2c62dc"
+        "13be4810.27374",
+        "2088078d.cb1e2",
+        "e3bae41.89a4a98",
+        "ed9405a6.bcc818",
+        "fe194fc5.986bf",
+        "c94ba2a6.6d9dc",
+        "49793ec.cd6ce4",
+        "5e8a3143.8db73",
+        "faf103f5.4614f8",
+        "88431892.8e89b8",
+        "cac051ff.1079b",
+        "8ab931f2.10742",
+        "38387e07.eee06a",
+        "c16c558d.bd7fa8",
+        "773efcf1.a16054",
+        "4610b0f7.2e9108",
+        "9860b974.593a3",
+        "e82d41b7.567df",
+        "763bc2b5.d71f9c",
+        "3cc87f7.3864a",
+        "5fefabc6.f62f5c",
+        "dbd95dbb.cf097"
       ]
     ]
   },
   {
-    "id": "c65cb0db.1db578",
+    "id": "faf103f5.4614f8",
     "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": 3898.883331298828,
-    "y": 3224.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3939.566665649414,
+    "y": 3217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6eab534.0772a8",
+    "id": "13be4810.27374",
     "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<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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",
+    "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<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3852.883331298828,
-    "y": 3322.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3887.566665649414,
+    "y": 3259.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b10b9835.71fc5",
+    "id": "2088078d.cb1e2",
     "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": 3988.883331298828,
-    "y": 3369.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4016.566665649414,
+    "y": 3301.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e8e8040.0d64",
+    "id": "c56513f7.9839c8",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3819.883331298828,
-    "y": 3173.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3862.566665649414,
+    "y": 3176.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "69147836.dfe478",
+    "id": "cb0612e7.fab918",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 4345.883331298828,
-    "y": 3664.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4387.566665649414,
+    "y": 3697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9c84ab4f.a1a008",
+    "id": "e3bae41.89a4a98",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.883331298828,
-    "y": 3703.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3951.566665649414,
+    "y": 3736.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "50925bce.958aec",
+    "id": "ed9405a6.bcc818",
     "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-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\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<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3857.883331298828,
-    "y": 3754.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3899.566665649414,
+    "y": 3787.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "eab645cb.c973",
+    "id": "fe194fc5.986bf",
     "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-middle-man-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-middle-man-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": 3993.883331298828,
-    "y": 3801.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4035.566665649414,
+    "y": 3834.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "921a5ccf.2b2f38",
+    "id": "3a844032.bf9ac",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3850.883331298828,
-    "y": 3663.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3892.566665649414,
+    "y": 3696.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8fa15646.014b68",
+    "id": "debaf07d.db6d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4280.883331298828,
-    "y": 3860.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4322.566665649414,
+    "y": 3893.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "74310cc1.794b3c",
+    "id": "c94ba2a6.6d9dc",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3871.883331298828,
-    "y": 3907.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3913.566665649414,
+    "y": 3940.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9785079b.24c0f8",
-        "81e9c000.43765",
-        "377b8f18.e7499"
+        "34b4bb6d.84f2ec",
+        "39b05e8d.991162",
+        "b7823394.4e1968"
       ]
     ]
   },
   {
-    "id": "9785079b.24c0f8",
+    "id": "34b4bb6d.84f2ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4118.883331298828,
-    "y": 3861.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4160.566665649414,
+    "y": 3894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8fa15646.014b68"
+        "debaf07d.db6d5"
       ]
     ]
   },
   {
-    "id": "81e9c000.43765",
+    "id": "39b05e8d.991162",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4119.374298095703,
-    "y": 3907.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 4161.057632446289,
+    "y": 3940.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b389b203.4af2"
+        "483dd1d6.aa392"
       ]
     ]
   },
   {
-    "id": "377b8f18.e7499",
+    "id": "b7823394.4e1968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.883331298828,
-    "y": 3950.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4158.566665649414,
+    "y": 3983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f887f7.029e08"
+        "59b157ce.93edc"
       ]
     ]
   },
   {
-    "id": "b389b203.4af2",
+    "id": "483dd1d6.aa392",
     "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": 4281.945709228516,
-    "y": 3907.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 4323.629043579102,
+    "y": 3940.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7f887f7.029e08",
+    "id": "59b157ce.93edc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4285.883331298828,
-    "y": 3951.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4327.566665649414,
+    "y": 3984.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "54d18bcb.0986c4",
+    "id": "773efcf1.a16054",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-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": 3928.883331298828,
-    "y": 4186.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3967.566665649414,
+    "y": 4282.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4494cc45.3ce764",
+    "id": "4610b0f7.2e9108",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3931.883331298828,
-    "y": 4231.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3970.566665649414,
+    "y": 4327.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5c180c8.9f0b08",
+    "id": "e82d41b7.567df",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3920.883331298828,
-    "y": 4022.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3962.566665649414,
+    "y": 4055.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "123d53b6.2c62dc",
+    "id": "763bc2b5.d71f9c",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3922.883331298828,
-    "y": 4069.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3964.566665649414,
+    "y": 4102.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8369bd06.57f78",
+    "id": "e3efee4c.cbd228",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3844.883331298828,
-    "y": 4139.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3883.566665649414,
+    "y": 4235.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "487123e4.9cc8ac",
+    "id": "a86d756f.b96748",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4451.883331298828,
-    "y": 4868.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4493.566665649414,
+    "y": 4901.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "44d48088.590d78",
+    "id": "eb692208.605d48",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3706.883331298828,
-    "y": 5021.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3748.566665649414,
+    "y": 5054.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "876b39f.35a52c8",
-        "8bc7cacf.04871"
+        "35961804.034dd",
+        "1c6960fb.af77c7"
       ]
     ]
   },
   {
-    "id": "8bc7cacf.04871",
+    "id": "1c6960fb.af77c7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3878.883331298828,
-    "y": 5018.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3920.566665649414,
+    "y": 5051.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "682f4705.be7878"
+        "44ac8602.f7b438"
       ]
     ]
   },
   {
-    "id": "876b39f.35a52c8",
+    "id": "35961804.034dd",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.883331298828,
-    "y": 5865.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3872.566665649414,
+    "y": 5898.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd90ad1a.7eef1"
+        "e66ef561.f9598"
       ]
     ]
   },
   {
-    "id": "270e251f.118d82",
+    "id": "a7546f8d.e642f8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3891.883331298828,
-    "y": 4988.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3933.566665649414,
+    "y": 5021.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4e629c01.10676c",
+    "id": "7377305c.6344e",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3901.883331298828,
-    "y": 5823.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3943.566665649414,
+    "y": 5856.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b442de01.03d108",
+    "id": "49793ec.cd6ce4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3928.883331298828,
-    "y": 4295.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3966.566665649414,
+    "y": 4430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "682f4705.be7878",
+    "id": "44ac8602.f7b438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4054.883331298828,
-    "y": 5020.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4096.566665649414,
+    "y": 5053.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bf69d5f0.d5943",
-        "50051e09.5a44c8",
-        "d933fbbc.703308",
-        "52cab496.bab24c",
-        "86c9672.840f818",
-        "81a4b89b.48797",
-        "487123e4.9cc8ac"
+        "f2639d5b.9b3268",
+        "eb43383.cb911c8",
+        "b431bc46.f09eb8",
+        "3f007800.f3335",
+        "6651db46.728784",
+        "ec10a332.513d58",
+        "a86d756f.b96748",
+        "128b476.c3c24b9",
+        "b1e27ce1.629f7"
       ]
     ]
   },
   {
-    "id": "b674f25b.3aa2a8",
+    "id": "3a4a9e77.4fc502",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5499.883331298828,
-    "y": 4493.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5541.566665649414,
+    "y": 4526.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bf69d5f0.d5943",
+    "id": "f2639d5b.9b3268",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4446.883331298828,
-    "y": 5171.883331298828,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5c84b550.a10344",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3938.883331298828,
-    "y": 4350.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4474.566665649414,
+    "y": 5556.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a559e6ec.97fea8",
+    "id": "5e8a3143.8db73",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 3563.883331298828,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ce126dd2.e4e358",
-    "type": "save",
-    "name": "save connectivityA relationship to UNI-LEAF, in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 3364.883331298828,
-    "y": 1782.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b48deb35.d704b8",
-    "type": "save",
-    "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3271.883331298828,
-    "y": 1729.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3945.566665649414,
+    "y": 3430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "dfa7cbf8.916408",
-    "type": "set",
-    "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
-    "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
-    "comments": "",
-    "x": 3954.883331298828,
-    "y": 3266.883331298828,
-    "z": "4456793a.59a288",
-    "wires": []
-  },
-  {
-    "id": "c0792f26.4d13b8",
+    "id": "88431892.8e89b8",
     "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": 3901.883331298828,
-    "y": 2854.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3943.566665649414,
+    "y": 2887.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e82ea719.e6f068",
+    "id": "cac051ff.1079b",
     "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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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",
+    "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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.883331298828,
-    "y": 2902.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3891.566665649414,
+    "y": 2935.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4a1bace.0d4bb",
+    "id": "8ab931f2.10742",
     "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": 3977.883331298828,
-    "y": 2949.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4019.566665649414,
+    "y": 2982.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c598b640.a89e8",
+    "id": "be22c48f.b88288",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3814.883331298828,
-    "y": 2812.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3856.566665649414,
+    "y": 2845.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8f561f42.000fe8",
+    "id": "38387e07.eee06a",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3811.883331298828,
-    "y": 3040.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3853.566665649414,
+    "y": 3073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa738c85.1c137",
+    "id": "c16c558d.bd7fa8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 3093.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3946.566665649414,
+    "y": 3126.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b51a7f91.5cff9",
+    "id": "8249248d.fd861",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3795.883331298828,
-    "y": 2996.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3837.566665649414,
+    "y": 3029.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4ec3384a.676a5",
+    "id": "8a8f5ba9.d4da6",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3801.883331298828,
-    "y": 3446.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3841.566665649414,
+    "y": 3345.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "52cab496.bab24c",
+    "id": "3f007800.f3335",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.883331298828,
-    "y": 4501.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4410.566665649414,
+    "y": 4534.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1646f155.836fb7",
+    "id": "5bce380a.32d878",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4352.883331298828,
-    "y": 4457.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4394.566665649414,
+    "y": 4490.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "778ce84a.a3568",
+    "id": "1b090d31.1314e3",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5099.883331298828,
-    "y": 4488.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5141.566665649414,
+    "y": 4521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b61f10f5.eeecf",
+    "id": "c30363c7.dd0dc",
     "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": 5186.883331298828,
-    "y": 4530.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5228.566665649414,
+    "y": 4563.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "90640d99.12302",
+    "id": "10271018.94b4f8",
     "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='`$middle-man-conn.etht-svc-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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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",
+    "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='`$middle-man-conn.etht-svc-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<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5134.883331298828,
-    "y": 4578.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5176.566665649414,
+    "y": 4611.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "42e8372d.d506e",
+    "id": "285754a8.44159c",
     "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": 5262.883331298828,
-    "y": 4625.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5304.566665649414,
+    "y": 4658.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "81a4b89b.48797",
+    "id": "ec10a332.513d58",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4439.883331298828,
-    "y": 4910.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4481.566665649414,
+    "y": 4943.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a53bc0fc.34d448",
+    "id": "572f6814.fa386",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4422.883331298828,
-    "y": 4972.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4464.566665649414,
+    "y": 5005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "50051e09.5a44c8",
+    "id": "eb43383.cb911c8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4533.883331298828,
-    "y": 5014.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4575.566665649414,
+    "y": 5047.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3073b323.349b7c",
+    "id": "8c58cbc3.7f4b88",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4981.883331298828,
-    "y": 5067.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5023.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dbdd7c00.c39698",
+    "id": "be5aff94.f7d12",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4291.883331298828,
-    "y": 5765.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4333.566665649414,
+    "y": 5798.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d6ec4bb.ad8c0b",
+    "id": "526f34d0.18befc",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 4189.883331298828,
-    "y": 5714.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4231.566665649414,
+    "y": 5747.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "41eb9866.4372",
+    "id": "6826024b.ca723c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4173.883331298828,
-    "y": 5670.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4215.566665649414,
+    "y": 5703.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c54f6272.9ba24",
+    "id": "be0ba193.2dd698",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4980.883087158203,
-    "y": 5868.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5001.566665649414,
+    "y": 5960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d933fbbc.703308",
+    "id": "b431bc46.f09eb8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4360.883331298828,
-    "y": 5071.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4402.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4c2996a3.75ee88",
-        "d5943bd2.ad1f5"
+        "baf822c4.3f205",
+        "32a48883.ef2b98"
       ]
     ]
   },
   {
-    "id": "4c2996a3.75ee88",
+    "id": "baf822c4.3f205",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4571.883331298828,
-    "y": 5071.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4613.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8f5805d9.890fd8"
+        "58c9a296.a42094"
       ]
     ]
   },
   {
-    "id": "8f5805d9.890fd8",
+    "id": "58c9a296.a42094",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4727.883331298828,
-    "y": 5067.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4769.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3073b323.349b7c",
-        "7eeebeb3.54b298",
-        "eadd33f3.5f43"
+        "8c58cbc3.7f4b88",
+        "3aab431e.930194",
+        "c5e59db3.c67ea"
       ]
     ]
   },
   {
-    "id": "d5943bd2.ad1f5",
+    "id": "32a48883.ef2b98",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4567.883331298828,
-    "y": 5119.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4609.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "329fba30.af81ce"
+        "255e5d4d.31482a"
       ]
     ]
   },
   {
-    "id": "329fba30.af81ce",
+    "id": "255e5d4d.31482a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4715.883331298828,
-    "y": 5114.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4757.566665649414,
+    "y": 5147.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7679135b.31e8e4",
+    "id": "3647078f.866d7",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-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": 5223.883331298828,
-    "y": 4696.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5265.566665649414,
+    "y": 4729.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d050303.0f4a3d",
+    "id": "79257077.5f1ff8",
     "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": 2389.883331298828,
-    "y": 107.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2431.566665649414,
+    "y": 140.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2f95f80.985fc",
+    "id": "8a55fb57.dfc438",
     "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": 2323.883331298828,
-    "y": 143.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2365.566665649414,
+    "y": 176.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "360465cd.d1fc3a",
+    "id": "d0423030.a4fb7",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2508.883331298828,
-    "y": 70.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2550.566665649414,
+    "y": 103.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "33673680.57cf72",
+    "id": "fad64a40.999cd8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\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`' />-->",
     "comments": "",
-    "x": 4258.883331298828,
-    "y": 5831.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4300.566665649414,
+    "y": 5864.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e2cec405.b0409",
+    "id": "1f999717.41db99",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4391.883331298828,
-    "y": 5879.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4433.566665649414,
+    "y": 5912.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e2ab292.566884",
+    "id": "c52167d8.94938",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210.883331298828,
-    "y": 5937.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4252.566665649414,
+    "y": 5970.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9073e816.ad482",
-        "45d66689.aaaf7"
+        "19e438e0.03d147",
+        "34d88bae.811d0c"
       ]
     ]
   },
   {
-    "id": "9073e816.ad482",
+    "id": "19e438e0.03d147",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4403.883331298828,
-    "y": 5938.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4445.566665649414,
+    "y": 5971.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "db09f17e.79bb3"
+        "41319fcd.d8b348"
       ]
     ]
   },
   {
-    "id": "db09f17e.79bb3",
+    "id": "41319fcd.d8b348",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4559.883331298828,
-    "y": 5935.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4601.566665649414,
+    "y": 5968.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "45d66689.aaaf7",
+    "id": "34d88bae.811d0c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4407.883331298828,
-    "y": 5982.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4449.566665649414,
+    "y": 6015.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2adb498f.b3f97e"
+        "9cc4dc7d.174798"
       ]
     ]
   },
   {
-    "id": "2adb498f.b3f97e",
+    "id": "9cc4dc7d.174798",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4546.883331298828,
-    "y": 5977.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4588.566665649414,
+    "y": 6010.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c54f6272.9ba24",
-        "6998ca1d.92c5d4",
-        "15021f96.80eb18",
-        "e6e1dbd3.6e0a6",
-        "67962261.2516d4",
-        "1b601be6.7f6134",
-        "27a83227.012ede",
-        "b320b0e.20770d",
-        "34955381.c5797c",
-        "9ca77368.01f7",
-        "6922fe88.2fe5f8",
-        "4514c9c4.eaef1"
+        "be0ba193.2dd698",
+        "9b687ead.d5262",
+        "bb8d3610.613d68",
+        "89f249f3.3e5608",
+        "1d656b5f.37186d",
+        "90bf2cc6.ca2d58",
+        "517a964c.5fa06",
+        "c8b3b99a.24ee1",
+        "2487bbac.e2018c",
+        "203e33ee.d272e4",
+        "3c1017d1.449bb",
+        "21e17170.9d1c4e"
       ]
     ]
   },
   {
-    "id": "27a83227.012ede",
+    "id": "517a964c.5fa06",
     "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/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4743.883331298828,
-    "y": 6656.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4785.566665649414,
+    "y": 6689.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c2308ca7.57dff",
-        "aeb0b0d0.9dedb8",
-        "b67a59a3.18fb1"
+        "f455e87a.bb05c8",
+        "dc467c76.6e0b1",
+        "26412110.73f856"
       ]
     ]
   },
   {
-    "id": "c2308ca7.57dff",
+    "id": "f455e87a.bb05c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4948.883331298828,
-    "y": 6653.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4990.566665649414,
+    "y": 6686.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eeeb2441.6710c8"
+        "8ff8217a.525ad8"
       ]
     ]
   },
   {
-    "id": "aeb0b0d0.9dedb8",
+    "id": "dc467c76.6e0b1",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4932.374298095703,
-    "y": 6715.457366943359,
-    "z": "4456793a.59a288",
+    "x": 4974.057632446289,
+    "y": 6748.140701293945,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "77e5496.94ba0b8"
+        "2b587a1.cfe3f86"
       ]
     ]
   },
   {
-    "id": "b67a59a3.18fb1",
+    "id": "26412110.73f856",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4929.883331298828,
-    "y": 6758.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4971.566665649414,
+    "y": 6791.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f70b29bb.3fb788"
+        "b747b55e.88ecf8"
       ]
     ]
   },
   {
-    "id": "eeeb2441.6710c8",
+    "id": "8ff8217a.525ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.883331298828,
-    "y": 6667.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5146.566665649414,
+    "y": 6700.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a3bf8aa6.020cb8"
+        "8429b279.d4cdf"
       ]
     ]
   },
   {
-    "id": "77e5496.94ba0b8",
+    "id": "2b587a1.cfe3f86",
     "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": 5094.945709228516,
-    "y": 6715.743103027344,
-    "z": "4456793a.59a288",
+    "x": 5136.629043579102,
+    "y": 6748.42643737793,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f70b29bb.3fb788",
+    "id": "b747b55e.88ecf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5096.883331298828,
-    "y": 6757.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5138.566665649414,
+    "y": 6790.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a3bf8aa6.020cb8",
+    "id": "8429b279.d4cdf",
     "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": 5351.883331298828,
-    "y": 6664.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5393.566665649414,
+    "y": 6697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8a5692b6.b002c8"
+        "1ddbd038.9357b"
       ]
     ]
   },
   {
-    "id": "8a5692b6.b002c8",
+    "id": "1ddbd038.9357b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5588.883331298828,
-    "y": 6660.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5630.566665649414,
+    "y": 6693.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eabc4609.9defb"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "98f388ed.2cda7",
+    "id": "e0649c96.67ff88",
     "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].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5831.883331298828,
-    "y": 6632.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5873.566665649414,
+    "y": 6665.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6a0ae6a2.ba9fb",
-        "25f881ea.6e0566"
+        "6697bde5.6a73ec",
+        "f1cd44ef.865458"
       ]
     ]
   },
   {
-    "id": "6a0ae6a2.ba9fb",
+    "id": "6697bde5.6a73ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6036.883331298828,
-    "y": 6652.883331298828,
-    "z": "4456793a.59a288",
+    "x": 6078.566665649414,
+    "y": 6685.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eabc4609.9defb"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "25f881ea.6e0566",
+    "id": "f1cd44ef.865458",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6035.883331298828,
-    "y": 6605.883331298828,
-    "z": "4456793a.59a288",
+    "x": 6077.566665649414,
+    "y": 6638.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "eabc4609.9defb",
+    "id": "7922b60b.c6e31",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4779.883331298828,
-    "y": 6927.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4821.566665649414,
+    "y": 6960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "392e3f81.e0a6a8"
+        "b0b5d457.a97bd"
       ]
     ]
   },
   {
-    "id": "f8de35a7.d0325",
+    "id": "1fa90257.6a5f2e",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 6241.88330078125,
-    "y": 6865.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6283.566635131836,
+    "y": 6898.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8d84ad9.3a159d",
+    "id": "a2de4936.eeff58",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4841.883331298828,
-    "y": 6603.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4883.566665649414,
+    "y": 6636.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1b601be6.7f6134",
+    "id": "90bf2cc6.ca2d58",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4725.883331298828,
-    "y": 6452.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4765.566665649414,
+    "y": 6524.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6e7ae435.b7607c",
+    "id": "917753a8.ea741",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5070.883331298828,
-    "y": 6283.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5110.566665649414,
+    "y": 6355.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "82ed19a6.aafd78"
+        "ddf721ac.b7eef8"
       ]
     ]
   },
   {
-    "id": "82ed19a6.aafd78",
+    "id": "ddf721ac.b7eef8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5290.883331298828,
-    "y": 6289.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5330.566665649414,
+    "y": 6361.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fa1ec726.b4647"
+        "ff49769d.1bd52"
       ]
     ]
   },
   {
-    "id": "fa1ec726.b4647",
+    "id": "ff49769d.1bd52",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5475.883331298828,
-    "y": 6288.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5517.566665649414,
+    "y": 6321.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "46306bd4.ee79e4"
+        "4e069c0d.3968f4"
       ]
     ]
   },
   {
-    "id": "46306bd4.ee79e4",
+    "id": "4e069c0d.3968f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5667.883331298828,
-    "y": 6291.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5709.566665649414,
+    "y": 6324.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3b3ddb68.994c3c"
+        "2305c4b2.be932c"
       ]
     ]
   },
   {
-    "id": "3b3ddb68.994c3c",
+    "id": "2305c4b2.be932c",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5876.883331298828,
-    "y": 6289.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5918.566665649414,
+    "y": 6322.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b320b0e.20770d",
+    "id": "c8b3b99a.24ee1",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4777.883331298828,
-    "y": 6277.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4817.566665649414,
+    "y": 6349.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6e7ae435.b7607c"
+        "917753a8.ea741"
       ]
     ]
   },
   {
-    "id": "15021f96.80eb18",
+    "id": "bb8d3610.613d68",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883331298828,
-    "y": 6170.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4825.566665649414,
+    "y": 6242.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "90de6696.037bd8",
-        "ce29f9bd.7d263",
-        "94bbebf0.09f428"
+        "ae57a65a.f0c818",
+        "d5c36a0.e7a9398",
+        "2780984c.5a15a"
       ]
     ]
   },
   {
-    "id": "90de6696.037bd8",
+    "id": "ae57a65a.f0c818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5021.883331298828,
-    "y": 6153.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5061.566665649414,
+    "y": 6225.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce29f9bd.7d263",
+    "id": "d5c36a0.e7a9398",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5018.883331298828,
-    "y": 6194.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5058.566665649414,
+    "y": 6266.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "94bbebf0.09f428",
+    "id": "2780984c.5a15a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5032.883331298828,
-    "y": 6234.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5072.566665649414,
+    "y": 6306.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6e1dbd3.6e0a6",
+    "id": "89f249f3.3e5608",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4721.883331298828,
-    "y": 6329.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4761.566665649414,
+    "y": 6401.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "67962261.2516d4",
+    "id": "1d656b5f.37186d",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' 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                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4729.883331298828,
-    "y": 6387.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4769.566665649414,
+    "y": 6459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6998ca1d.92c5d4",
+    "id": "9b687ead.d5262",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4734.883331298828,
-    "y": 6127.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4774.566665649414,
+    "y": 6199.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "94b4d538.041a9",
+    "id": "201d95ad.f7c612",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4849.883331298828,
-    "y": 6079.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4889.566665649414,
+    "y": 6151.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "392e3f81.e0a6a8",
+    "id": "b0b5d457.a97bd",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5022.883331298828,
-    "y": 6924.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5064.566665649414,
+    "y": 6957.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "84fb2e7.f2e54d",
-        "113d3615.17adaa"
+        "46f9fbf7.fbe6cc",
+        "bab2d066.0ad5b"
       ]
     ]
   },
   {
-    "id": "84fb2e7.f2e54d",
+    "id": "46f9fbf7.fbe6cc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.883331298828,
-    "y": 6901.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5293.566665649414,
+    "y": 6934.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c3b316fd.fba0a8"
+        "66be0922.f0399"
       ]
     ]
   },
   {
-    "id": "113d3615.17adaa",
+    "id": "bab2d066.0ad5b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.883331298828,
-    "y": 6950.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5293.566665649414,
+    "y": 6983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6424391.0ceee8",
+    "id": "646b562c.1751a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5984.88330078125,
-    "y": 6956.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6026.566635131836,
+    "y": 6989.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1cb2d5ed.65008a",
-        "f8de35a7.d0325",
-        "515cca2b.2a6e8c"
+        "898afc0c.eb00d8",
+        "1fa90257.6a5f2e",
+        "9d2bedee.a23cf"
       ]
     ]
   },
   {
-    "id": "b0305853.25009",
+    "id": "5bb30070.2c2c98",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6369.88330078125,
-    "y": 6919.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6411.566635131836,
+    "y": 6952.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "515cca2b.2a6e8c",
+    "id": "9d2bedee.a23cf",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6339.88330078125,
-    "y": 6979.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6381.566635131836,
+    "y": 7012.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1cb2d5ed.65008a",
+    "id": "898afc0c.eb00d8",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6246.88330078125,
-    "y": 6807.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6288.566635131836,
+    "y": 6840.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dd90ad1a.7eef1",
+    "id": "e66ef561.f9598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3982.883331298828,
-    "y": 5864.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4024.566665649414,
+    "y": 5897.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d6ec4bb.ad8c0b",
-        "33673680.57cf72",
-        "e2cec405.b0409",
-        "6e2ab292.566884",
-        "dbdd7c00.c39698"
+        "526f34d0.18befc",
+        "fad64a40.999cd8",
+        "1f999717.41db99",
+        "c52167d8.94938",
+        "be5aff94.f7d12"
       ]
     ]
   },
   {
-    "id": "74fcf6b5.dbb39",
+    "id": "55c4563d.130918",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4726.883331298828,
-    "y": 6227.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4766.566665649414,
+    "y": 6299.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "34955381.c5797c",
+    "id": "2487bbac.e2018c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4873.883087158203,
-    "y": 5949.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4894.566665649414,
+    "y": 6041.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2a032dd9.9380b2",
+    "id": "eef6a242.86b638",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5010.883087158203,
-    "y": 5899.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5031.566665649414,
+    "y": 5991.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b937ed07.a77618",
+    "id": "9860b974.593a3",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3817.883331298828,
-    "y": 3505.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3858.566665649414,
+    "y": 3384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3dd82151.976f0e",
+    "id": "c96fd773.2e2468",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.883331298828,
-    "y": 1760.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4036.566635131836,
+    "y": 1619.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6b6522.bc964ae",
+    "id": "e5b482c4.4ff96",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3977.883331298828,
-    "y": 2630.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4015.566604614258,
+    "y": 2131.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "195c3e5b.085da2",
+    "id": "58efc802.973c9",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3808.883331298828,
-    "y": 3972.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3850.566665649414,
+    "y": 4005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a8e7354f.a1833",
+    "id": "517fe5d1.d6143c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.883331298828,
-    "y": 6004.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3940.566665649414,
+    "y": 6385.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a2dd9c19.75287",
+    "id": "fa1a129b.8e1e58",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\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`' />-->",
     "comments": "",
-    "x": 3700.883331298828,
-    "y": 4881.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3742.566665649414,
+    "y": 4914.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "906b118c.b5ca4",
+    "id": "8f8ab353.277fd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.883331298828,
-    "y": 4929.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3875.566665649414,
+    "y": 4962.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "86c9672.840f818",
+    "id": "6651db46.728784",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4379.883331298828,
-    "y": 4557.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4421.566665649414,
+    "y": 4590.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b9a92126.1d0eb",
-        "e7523195.456808"
+        "894780c2.49e69",
+        "859a7332.ec6f6"
       ]
     ]
   },
   {
-    "id": "b9a92126.1d0eb",
+    "id": "894780c2.49e69",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4572.883331298828,
-    "y": 4558.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4614.566665649414,
+    "y": 4591.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "71a4d763.a9eac"
+        "ba88b5a5.1ae688"
       ]
     ]
   },
   {
-    "id": "e7523195.456808",
+    "id": "859a7332.ec6f6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4576.883331298828,
-    "y": 4602.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4618.566665649414,
+    "y": 4635.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6742a953.fe0d28"
+        "99dc491a.da7278"
       ]
     ]
   },
   {
-    "id": "6742a953.fe0d28",
+    "id": "99dc491a.da7278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4715.883331298828,
-    "y": 4597.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4757.566665649414,
+    "y": 4630.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34f2cb8a.7f3954",
-        "50607a4b.9927b4",
-        "d6e6e1de.8f0598"
+        "8cf9ac68.b6fb08",
+        "b04660b8.eae2",
+        "fb45e770.b6fb4"
       ]
     ]
   },
   {
-    "id": "71a4d763.a9eac",
+    "id": "ba88b5a5.1ae688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4715.883331298828,
-    "y": 4554.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4757.566665649414,
+    "y": 4587.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b61f10f5.eeecf",
-        "90640d99.12302",
-        "42e8372d.d506e",
-        "7679135b.31e8e4"
+        "c30363c7.dd0dc",
+        "10271018.94b4f8",
+        "285754a8.44159c",
+        "3647078f.866d7"
       ]
     ]
   },
   {
-    "id": "34f2cb8a.7f3954",
+    "id": "8cf9ac68.b6fb08",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5117.883575439453,
-    "y": 4819.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5159.566909790039,
+    "y": 4852.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d0b91dc.02ae8",
+    "id": "f52716f7.92c318",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5124.883575439453,
-    "y": 4773.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5166.566909790039,
+    "y": 4806.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9ca77368.01f7",
+    "id": "203e33ee.d272e4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4914.883331298828,
-    "y": 6552.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4956.566665649414,
+    "y": 6585.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "50607a4b.9927b4",
+    "id": "b04660b8.eae2",
     "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/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\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": 5235.883575439453,
-    "y": 4861.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5277.566909790039,
+    "y": 4894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7eeebeb3.54b298",
+    "id": "3aab431e.930194",
     "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/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\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": 5110.883331298828,
-    "y": 5119.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5152.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d039e4e7.e91be8",
+    "id": "b6e6466d.f535c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3664.883331298828,
-    "y": 4479.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3497.566665649414,
+    "y": 4485.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3c0dfd8f.f0eaca",
+    "id": "eb0222bd.49b5a",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3998.883331298828,
-    "y": 4662.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4019.566665649414,
+    "y": 4586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "80cc4c1e.a6bfe",
+    "id": "e967635e.d5f898",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3610.883331298828,
-    "y": 4529.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3476.566665649414,
+    "y": 4529.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ef8f5d34.35bfc8",
-        "7b54fcfe.00d69c",
-        "e9708f34.58ed3"
+        "a0645295.c076d8",
+        "9cfd1461.a062b8",
+        "c3fd0eeb.1191a"
       ]
     ]
   },
   {
-    "id": "7b54fcfe.00d69c",
+    "id": "9cfd1461.a062b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.374298095703,
-    "y": 4502.457305908203,
-    "z": "4456793a.59a288",
+    "x": 3665.057632446289,
+    "y": 4498.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "edc83f73.f7df38"
+        "763a574e.7131"
       ]
     ]
   },
   {
-    "id": "e9708f34.58ed3",
+    "id": "c3fd0eeb.1191a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.883331298828,
-    "y": 4546.883270263672,
-    "z": "4456793a.59a288",
+    "x": 3653.566665649414,
+    "y": 4537.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a66e06b4.3bd7c"
+        "64809ae2.7e048c"
       ]
     ]
   },
   {
-    "id": "edc83f73.f7df38",
+    "id": "763a574e.7131",
     "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": 4000.945831298828,
-    "y": 4501.743011474609,
-    "z": "4456793a.59a288",
+    "x": 3824.629165649414,
+    "y": 4496.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a66e06b4.3bd7c",
+    "id": "64809ae2.7e048c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4001.883331298828,
-    "y": 4546.883270263672,
-    "z": "4456793a.59a288",
+    "x": 3814.566665649414,
+    "y": 4538.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fa42d876.f3bfc8",
+    "id": "9a196ab1.500e98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3786.883331298828,
-    "y": 4619.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3816.566665649414,
+    "y": 4582.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b660a30a.8893a8",
-        "3c0dfd8f.f0eaca"
+        "6eb0cd28.22b8f4",
+        "eb0222bd.49b5a"
       ]
     ]
   },
   {
-    "id": "ef8f5d34.35bfc8",
+    "id": "a0645295.c076d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.883331298828,
-    "y": 4619.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3658.566665649414,
+    "y": 4574.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fa42d876.f3bfc8"
+        "9a196ab1.500e98"
       ]
     ]
   },
   {
-    "id": "b660a30a.8893a8",
+    "id": "6eb0cd28.22b8f4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3975.883331298828,
-    "y": 4611.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3977.566665649414,
+    "y": 4514.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3d1de5ec.2ac45a",
+    "id": "a7e951fd.34174",
     "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/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\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": 3808.883331298828,
-    "y": 4757.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3842.566665649414,
+    "y": 4853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "25e4380.733ab48",
+    "id": "a3ce23a7.48a0c8",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5915.766632080078,
-    "y": 6570.766632080078,
-    "z": "4456793a.59a288",
+    "x": 5957.449966430664,
+    "y": 6603.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d6e6e1de.8f0598",
+    "id": "fb45e770.b6fb4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update 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='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5115.550567626953,
-    "y": 4957.966827392578,
-    "z": "4456793a.59a288",
+    "x": 5157.233901977539,
+    "y": 4990.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "924c8eb8.8bcc2",
+    "id": "7a5a11e8.fe41c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5117.767364501953,
-    "y": 4917.766632080078,
-    "z": "4456793a.59a288",
+    "x": 5159.450698852539,
+    "y": 4950.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eadd33f3.5f43",
+    "id": "c5e59db3.c67ea",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update 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='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4991.550323486328,
-    "y": 5207.966827392578,
-    "z": "4456793a.59a288",
+    "x": 5033.233657836914,
+    "y": 5240.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "33d164e6.6e7844",
+    "id": "57dbe634.714a18",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4993.767120361328,
-    "y": 5167.766632080078,
-    "z": "4456793a.59a288",
+    "x": 5035.450454711914,
+    "y": 5200.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3216abfb.82724c",
+    "id": "aa096a62.a00c18",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5086.350128173828,
-    "y": 5663.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5123.033462524414,
+    "y": 5603.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "723b66c7.37bb08",
+    "id": "a1684c9.099dc3",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4913.350128173828,
-    "y": 5720.399932861328,
-    "z": "4456793a.59a288",
+    "x": 4950.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4b59f245.4d6edc",
-        "fb820a66.06fc1"
+        "322ec37b.7f462c",
+        "a4688844.be2738"
       ]
     ]
   },
   {
-    "id": "4b59f245.4d6edc",
+    "id": "322ec37b.7f462c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.350128173828,
-    "y": 5720.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5161.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "95f01780.285928"
+        "32e06877.2a572"
       ]
     ]
   },
   {
-    "id": "fb820a66.06fc1",
+    "id": "a4688844.be2738",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.350128173828,
-    "y": 5768.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5157.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ceaa430d.e25cf8"
+        "748c1810.be501"
       ]
     ]
   },
   {
-    "id": "95f01780.285928",
+    "id": "32e06877.2a572",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.350128173828,
-    "y": 5716.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5317.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "363f2480.f640d4",
-        "ec57c9d5.e1e658",
-        "18db1f41.a7c409"
+        "c380fc3b.e6c15",
+        "4e971f2e.5d2078",
+        "7fabceea.e8bd9"
       ]
     ]
   },
   {
-    "id": "ceaa430d.e25cf8",
+    "id": "748c1810.be501",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5268.350128173828,
-    "y": 5763.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5305.033462524414,
+    "y": 5703.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7a15e8cb.5f6df8",
+    "id": "bf0ec53.d08f2b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5546.233917236328,
-    "y": 5816.283233642578,
-    "z": "4456793a.59a288",
+    "x": 5626.917251586914,
+    "y": 5756.966567993164,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "18db1f41.a7c409",
+    "id": "7fabceea.e8bd9",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update 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='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5544.017120361328,
-    "y": 5856.483428955078,
-    "z": "4456793a.59a288",
+    "x": 5630.700454711914,
+    "y": 5795.166763305664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec57c9d5.e1e658",
+    "id": "4e971f2e.5d2078",
     "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/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\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": 5663.350128173828,
-    "y": 5768.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5737.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "363f2480.f640d4",
+    "id": "c380fc3b.e6c15",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5534.350128173828,
-    "y": 5716.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5621.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "60039858.187258",
+    "id": "ddfb9582.3445a8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.350128173828,
-    "y": 5621.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5012.033462524414,
+    "y": 5561.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6922fe88.2fe5f8",
+    "id": "3c1017d1.449bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4682.683135986328,
-    "y": 5703.399932861328,
-    "z": "4456793a.59a288",
+    "x": 4724.366470336914,
+    "y": 5736.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3216abfb.82724c",
-        "723b66c7.37bb08"
+        "aa096a62.a00c18",
+        "a1684c9.099dc3",
+        "a4cbceb2.4df788",
+        "9c03eaae.aa875"
       ]
     ]
   },
   {
-    "id": "4514c9c4.eaef1",
+    "id": "21e17170.9d1c4e",
     "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/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\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": 5003.716094970703,
-    "y": 6005.083526611328,
-    "z": "4456793a.59a288",
+    "x": 5024.399673461914,
+    "y": 6096.766860961914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d7548734.759b08",
+    "id": "bfe53aa3.d585a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5789,
-    "y": 6901,
-    "z": "4456793a.59a288",
+    "x": 5830.683334350586,
+    "y": 6933.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3b316fd.fba0a8",
+    "id": "66be0922.f0399",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5408,
-    "y": 6904,
-    "z": "4456793a.59a288",
+    "x": 5449.683334350586,
+    "y": 6936.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7548734.759b08",
-        "d42bdb23.7a5dc8",
-        "40573be3.cee89c"
+        "bfe53aa3.d585a8",
+        "f8b29486.7e71d",
+        "bf54edf8.ad3758"
       ]
     ]
   },
   {
-    "id": "d42bdb23.7a5dc8",
+    "id": "f8b29486.7e71d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5634,
-    "y": 6956,
-    "z": "4456793a.59a288",
+    "x": 5675.683334350586,
+    "y": 6988.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4a08f8b2.c71278"
+        "45d6980.5fa0ee8"
       ]
     ]
   },
   {
-    "id": "4a08f8b2.c71278",
+    "id": "45d6980.5fa0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5813,
-    "y": 6955,
-    "z": "4456793a.59a288",
+    "x": 5854.683334350586,
+    "y": 6987.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b6424391.0ceee8"
+        "646b562c.1751a8"
       ]
     ]
   },
   {
-    "id": "40573be3.cee89c",
+    "id": "bf54edf8.ad3758",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5635,
-    "y": 6849,
-    "z": "4456793a.59a288",
+    "x": 5676.683334350586,
+    "y": 6881.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "7c0aae65.c25f7",
+    "type": "notify",
+    "name": "notify",
+    "xml": "<notify plugin='' resource='' action='' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2670.683334350586,
+    "y": 930.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c9e93381.966988",
+    "type": "set",
+    "name": "set network-route-three",
+    "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
+    "comments": "",
+    "x": 3348.683334350586,
+    "y": 706.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "18d11d50.cb3a7b",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3564.683334350586,
+    "y": 1034.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e2e500c.35b568",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3560.192398071289,
+    "y": 1077.109390258789,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ac92425e.1b5228",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3564.192367553711,
+    "y": 1125.109359741211,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "74bd1e76.c1a798"
+      ]
+    ]
+  },
+  {
+    "id": "74bd1e76.c1a798",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3721.683334350586,
+    "y": 1124.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "75cda54f.508c54"
+      ]
+    ]
+  },
+  {
+    "id": "75cda54f.508c54",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3891.683364868164,
+    "y": 1127.6834869384766,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b5759425.3c5bd",
+        "a5689d25.4480b8",
+        "32c4f78e.6013e8"
+      ]
+    ]
+  },
+  {
+    "id": "b5759425.3c5bd",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4065.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e254226b.74faf"
+      ]
+    ]
+  },
+  {
+    "id": "a5689d25.4480b8",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4067.683334350586,
+    "y": 1119.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b214dc3a.ed1eb8"
+      ]
+    ]
+  },
+  {
+    "id": "e254226b.74faf",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4193.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "1e63a796.08e87",
+        "c1790587.ac9f08"
+      ]
+    ]
+  },
+  {
+    "id": "b214dc3a.ed1eb8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4196.683334350586,
+    "y": 1118.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "ea9630d6.e1db68",
+        "7cd0ca92.870d14"
+      ]
+    ]
+  },
+  {
+    "id": "c1790587.ac9f08",
+    "type": "set",
+    "name": "set network-route-B",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4354.683334350586,
+    "y": 1089.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "ea9630d6.e1db68",
+    "type": "set",
+    "name": "set network-route-LEAF",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4371.683334350586,
+    "y": 1131.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "7cd0ca92.870d14",
+    "type": "set",
+    "name": "set network-route-A",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4356.683334350586,
+    "y": 1169.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "1e63a796.08e87",
+    "type": "set",
+    "name": "set network-route-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4368.683334350586,
+    "y": 1049.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "5b64a8f4.eea95",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4533.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
+  },
+  {
+    "id": "5fc9799.82ba788",
+    "type": "save",
+    "name": "get network-route-three 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-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 3324.683334350586,
+    "y": 1051.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "18d11d50.cb3a7b",
+        "e2e500c.35b568",
+        "ac92425e.1b5228"
+      ]
+    ]
+  },
+  {
+    "id": "32c4f78e.6013e8",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4010.683334350586,
+    "y": 1183.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e8d5048b.eb9908"
+      ]
+    ]
+  },
+  {
+    "id": "e8d5048b.eb9908",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4184.683334350586,
+    "y": 1178.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "cbdde789.933e38",
+        "ff9c265d.ccb66"
+      ]
+    ]
+  },
+  {
+    "id": "ff9c265d.ccb66",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4354.683334350586,
+    "y": 1251.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "cbdde789.933e38",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4408.683334350586,
+    "y": 1211.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "fa28f519.9b734",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4522.683334350586,
+    "y": 1236.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "65095290.735c7c",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4081.683334350586,
+    "y": 939.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "6a27287d.2ebf6"
+      ]
+    ]
+  },
+  {
+    "id": "d7809ac8.28364",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4425.683334350586,
+    "y": 1007.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "38b369ba.8d91fe",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4479.683334350586,
+    "y": 967.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "7d1c2c8b.bd9814",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4623.683334350586,
+    "y": 996.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "6a27287d.2ebf6",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4255.683334350586,
+    "y": 934.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "38b369ba.8d91fe",
+        "d7809ac8.28364"
+      ]
+    ]
+  },
+  {
+    "id": "b03ebc69.8e68d8",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4141.683334350586,
+    "y": 677.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e58f35e3.4b6a2"
+      ]
+    ]
+  },
+  {
+    "id": "6a2c136e.692edc",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4485.683334350586,
+    "y": 745.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "66ae94b1.018af4",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4539.683334350586,
+    "y": 705.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "33be367d.fbce62",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4653.683334350586,
+    "y": 730.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "e58f35e3.4b6a2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4315.683334350586,
+    "y": 672.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "66ae94b1.018af4",
+        "6a2c136e.692edc"
+      ]
+    ]
+  },
+  {
+    "id": "64cdb464.83135c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3722.683334350586,
+    "y": 2554.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "7a3829d.42a01d8",
+        "d03e5e53.5cee58"
+      ]
+    ]
+  },
+  {
+    "id": "6e42edd4.58cd0c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3550.016830444336,
+    "y": 2555.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "64cdb464.83135c"
+      ]
+    ]
+  },
+  {
+    "id": "b61e07a3.0e4238",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3559.507797241211,
+    "y": 2598.257369995117,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2df3a08e.41f4c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3548.016830444336,
+    "y": 2644.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7a3829d.42a01d8",
+    "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-C.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-domainC\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4009.016830444336,
+    "y": 2558.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "38c64779.e618f",
+        "14f81708.27e459"
+      ]
+    ]
+  },
+  {
+    "id": "14f81708.27e459",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4232.016830444336,
+    "y": 2513.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "2753f3be.c9c924"
+      ]
+    ]
+  },
+  {
+    "id": "38c64779.e618f",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4234.016830444336,
+    "y": 2577.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "43ad3093.31a088"
+      ]
+    ]
+  },
+  {
+    "id": "9fbb56ee.c43378",
+    "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.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.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": 3322.016830444336,
+    "y": 2590.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "6e42edd4.58cd0c",
+        "b61e07a3.0e4238",
+        "2df3a08e.41f4c"
+      ]
+    ]
+  },
+  {
+    "id": "ac1718b4.765b78",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3283.016830444336,
+    "y": 2534.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "7ebd6769.0b5428",
+    "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-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3342.016830444336,
+    "y": 2330.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "2f0a58a8.ee7038",
+        "79cdcb97.546894"
+      ]
+    ]
+  },
+  {
+    "id": "79cdcb97.546894",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3565.016830444336,
+    "y": 2316.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "49eedb67.f00374"
+      ]
+    ]
+  },
+  {
+    "id": "2f0a58a8.ee7038",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3567.016830444336,
+    "y": 2349.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "49eedb67.f00374",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3713.016830444336,
+    "y": 2309.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "f5d93681.391ea",
+        "66937670.413898"
+      ]
+    ]
+  },
+  {
+    "id": "f5d93681.391ea",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
+    "comments": "",
+    "x": 3907.016830444336,
+    "y": 2312.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "d03e5e53.5cee58",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3960.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "1dfcba6a.928896"
+      ]
+    ]
+  },
+  {
+    "id": "1dfcba6a.928896",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4166.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "ad7b62a1.1a3de8"
+      ]
+    ]
+  },
+  {
+    "id": "66937670.413898",
+    "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.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3929.016830444336,
+    "y": 2380.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "7e1c1529.6f1464",
+        "e1251115.be77b",
+        "d084db0e.513758"
+      ]
+    ]
+  },
+  {
+    "id": "7e1c1529.6f1464",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4124.516952514648,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "24a5d36d.06630c"
+      ]
+    ]
+  },
+  {
+    "id": "e1251115.be77b",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4116.516952514648,
+    "y": 2387.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e4759099.9196a"
+      ]
+    ]
+  },
+  {
+    "id": "d084db0e.513758",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4121.516952514648,
+    "y": 2444.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "68e5ccfb.96ac94"
+      ]
+    ]
+  },
+  {
+    "id": "68e5ccfb.96ac94",
+    "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": 4273.516952514648,
+    "y": 2445.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "24a5d36d.06630c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4268.899276733398,
+    "y": 2330.339126586914,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b2ff1ea.8d4406"
+      ]
+    ]
+  },
+  {
+    "id": "387e5bde.fd50e4",
+    "type": "set",
+    "name": "set SECONDARY-ROOT stuff",
+    "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
+    "comments": "",
+    "x": 3344.683334350586,
+    "y": 2669.683334350586,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "4cfd3be4.f62fcc",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 4019.683303833008,
+    "y": 2633.683303833008,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "43ad3093.31a088",
+    "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": 4393.016830444336,
+    "y": 2596.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "2753f3be.c9c924",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4397.016830444336,
+    "y": 2510.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "a6bf1231.b0b2f8",
+        "b6449bb5.90e018"
+      ]
+    ]
+  },
+  {
+    "id": "ad7b62a1.1a3de8",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4383.302444458008,
+    "y": 2680.505081176758,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e5d22111.f520c"
+      ]
+    ]
+  },
+  {
+    "id": "e4759099.9196a",
+    "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": 4284.516952514648,
+    "y": 2390.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "a6bf1231.b0b2f8",
+    "type": "set",
+    "name": "set ltpId",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
+    "comments": "",
+    "x": 4567.016830444336,
+    "y": 2471.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "b6449bb5.90e018",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
+    "comments": "",
+    "x": 4568.016830444336,
+    "y": 2576.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "2544beb5.524cf2",
+    "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": 4563.016830444336,
+    "y": 2525.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "e5d22111.f520c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4590.133987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "387e5354.258eec",
+        "d91f6407.9298c8",
+        "8a12363d.8f67b8"
+      ]
+    ]
+  },
+  {
+    "id": "387e5354.258eec",
+    "type": "set",
+    "name": "set destination ttp-id",
+    "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 4805.133987426758,
+    "y": 2632.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "d91f6407.9298c8",
+    "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-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4802.133987426758,
+    "y": 2671.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "824c0ca3.93f64"
+      ]
+    ]
+  },
+  {
+    "id": "8a12363d.8f67b8",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4757.633987426758,
+    "y": 2713.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "b23c99bf.cf2e8",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4851.016830444336,
+    "y": 2348.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "97206b42.8c742"
+      ]
+    ]
+  },
+  {
+    "id": "b2ff1ea.8d4406",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4453.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3bc9e41b.32e2f4"
+      ]
+    ]
+  },
+  {
+    "id": "3bc9e41b.32e2f4",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4648.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b23c99bf.cf2e8",
+        "c333a868.fb119"
+      ]
+    ]
+  },
+  {
+    "id": "c333a868.fb119",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4853.016830444336,
+    "y": 2421.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "bd453b0b.71f93"
+      ]
+    ]
+  },
+  {
+    "id": "824c0ca3.93f64",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4982.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "95206ee6.94dd"
+      ]
+    ]
+  },
+  {
+    "id": "95206ee6.94dd",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5140.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "a1087d28.90e2f"
+      ]
+    ]
+  },
+  {
+    "id": "a1087d28.90e2f",
+    "type": "set",
+    "name": "set destination tunnel tp ip",
+    "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
+    "comments": "",
+    "x": 5347.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "97206b42.8c742",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5028.016830444336,
+    "y": 2340.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "4cfed3d4.2e715c",
+        "b3c82e8a.c152c"
+      ]
+    ]
+  },
+  {
+    "id": "b3c82e8a.c152c",
+    "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.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 5236.016830444336,
+    "y": 2347.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "c3765dd7.98e19",
+        "82480139.31c848",
+        "da19380a.5cc67"
+      ]
+    ]
+  },
+  {
+    "id": "bd453b0b.71f93",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5030.016830444336,
+    "y": 2413.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "14471967.2bb00f"
+      ]
+    ]
+  },
+  {
+    "id": "4cfed3d4.2e715c",
+    "type": "set",
+    "name": "set esr-thirdparty-sdnc domainC id",
+    "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5266.016830444336,
+    "y": 2295.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "14471967.2bb00f",
+    "type": "set",
+    "name": "set domainC ethernet layer network-id",
+    "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5265.016830444336,
+    "y": 2537.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "c3765dd7.98e19",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5446.016830444336,
+    "y": 2338.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "eb76aab.05915d8"
+      ]
+    ]
+  },
+  {
+    "id": "82480139.31c848",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5438.016830444336,
+    "y": 2393.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3c8ef50f.dc9d5a"
+      ]
+    ]
+  },
+  {
+    "id": "da19380a.5cc67",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5443.016830444336,
+    "y": 2450.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "11ed4dc4.069aca"
+      ]
+    ]
+  },
+  {
+    "id": "11ed4dc4.069aca",
+    "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": 5595.016830444336,
+    "y": 2451.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "3c8ef50f.dc9d5a",
+    "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": 5606.016830444336,
+    "y": 2396.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "eb76aab.05915d8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5590.399154663086,
+    "y": 2336.339126586914,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "57675f66.16eb5"
+      ]
+    ]
+  },
+  {
+    "id": "57675f66.16eb5",
+    "type": "set",
+    "name": "set controller domainC data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.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": 5805.016830444336,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "a78822a6.5321b",
+    "type": "switchNode",
+    "name": "switch secondary empty?",
+    "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3318.683334350586,
+    "y": 805.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "ee3317c4.be6f98",
+        "785558d0.46aa7"
+      ]
+    ]
+  },
+  {
+    "id": "ee3317c4.be6f98",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3440.683364868164,
+    "y": 750.6833648681641,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b70329ff.3ba71"
+      ]
+    ]
+  },
+  {
+    "id": "785558d0.46aa7",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3427.683364868164,
+    "y": 859.6833648681641,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "e7d34a7a.6aac6"
+      ]
+    ]
+  },
+  {
+    "id": "b70329ff.3ba71",
+    "type": "set",
+    "name": "set hasSecondary false",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+    "comments": "",
+    "x": 3655.683334350586,
+    "y": 587.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "e7d34a7a.6aac6",
+    "type": "set",
+    "name": "set hasSecondary true",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+    "comments": "",
+    "x": 3651.683334350586,
+    "y": 631.6833343505859,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "3cc87f7.3864a",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3848.683364868164,
+    "y": 3531.683364868164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "f7171cc6.827928"
+      ]
+    ]
+  },
+  {
+    "id": "f7171cc6.827928",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4039.683364868164,
+    "y": 3535.683364868164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "27271b87.886184"
+      ]
+    ]
+  },
+  {
+    "id": "27271b87.886184",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4166.683364868164,
+    "y": 3534.683364868164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "90e47ea0.ecee8",
+        "8a6c8ced.8f741"
+      ]
+    ]
+  },
+  {
+    "id": "8a6c8ced.8f741",
+    "type": "save",
+    "name": "save SECONDARY-ROOT UNI in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4388.683364868164,
+    "y": 3423.683364868164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a4c94b0b.1b4718",
+    "type": "set",
+    "name": "unset secondary related variables",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
+    "comments": "",
+    "x": 3393.566665649414,
+    "y": 463.56666564941406,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "90e47ea0.ecee8",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4384.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "61b6ba56.719bdc",
+        "226a53c4.28be4c"
+      ]
+    ]
+  },
+  {
+    "id": "61b6ba56.719bdc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4594.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3f2dca65.c993b6"
+      ]
+    ]
+  },
+  {
+    "id": "3f2dca65.c993b6",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4720.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "812380f1.94aae8"
+      ]
+    ]
+  },
+  {
+    "id": "32cc56e4.b47402",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4725.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "7de42311.cfc97c",
+        "94a4f684.655798",
+        "9102db37.03feb",
+        "168bc7a3.f57628"
+      ]
+    ]
+  },
+  {
+    "id": "226a53c4.28be4c",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4599.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "32cc56e4.b47402"
+      ]
+    ]
+  },
+  {
+    "id": "812380f1.94aae8",
+    "type": "save",
+    "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5048.566665649414,
+    "y": 3456.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7de42311.cfc97c",
+    "type": "execute",
+    "name": "execute UUID generator for connectivity domainC",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5001.566665649414,
+    "y": 3547.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "94a4f684.655798",
+    "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-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\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-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\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='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4949.566665649414,
+    "y": 3589.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9102db37.03feb",
+    "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-domainC-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-domainC-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": 5078.566665649414,
+    "y": 3631.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3c0b7ceb.8c4ecc",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 4964.566665649414,
+    "y": 3504.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "168bc7a3.f57628",
+    "type": "save",
+    "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5056.566665649414,
+    "y": 3679.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "54d0b322.54c85c",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 3876.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "5fefabc6.f62f5c",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3851.566665649414,
+    "y": 4153.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b4ef06b7.1fe62"
+      ]
+    ]
+  },
+  {
+    "id": "b4ef06b7.1fe62",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4043.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "815df3f1.7eb0f"
+      ]
+    ]
+  },
+  {
+    "id": "815df3f1.7eb0f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4172.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "67264e9c.83602"
+      ]
+    ]
+  },
+  {
+    "id": "67264e9c.83602",
+    "type": "save",
+    "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 4504.566665649414,
+    "y": 4146.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dbd95dbb.cf097",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3839.566665649414,
+    "y": 4377.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "aef64578.f3199"
+      ]
+    ]
+  },
+  {
+    "id": "aef64578.f3199",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4019.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "9830e38b.25b19"
+      ]
+    ]
+  },
+  {
+    "id": "9830e38b.25b19",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4148.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "7d4e5c3a.fc6a0c"
+      ]
+    ]
+  },
+  {
+    "id": "7d4e5c3a.fc6a0c",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4366.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "1e59b518.b0bee3"
+      ]
+    ]
+  },
+  {
+    "id": "1e59b518.b0bee3",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4581.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "40af1183.5043e"
+      ]
+    ]
+  },
+  {
+    "id": "40af1183.5043e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4713.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "9532f45e.79d66"
+      ]
+    ]
+  },
+  {
+    "id": "9532f45e.79d66",
+    "type": "save",
+    "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-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-domainC-uuid`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5077.566665649414,
+    "y": 4374.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "147222b6.72d4a5",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3514.566665649414,
+    "y": 4632.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "adad110b.2a8008"
+      ]
+    ]
+  },
+  {
+    "id": "adad110b.2a8008",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3694.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "b9b6357c.7dc958"
+      ]
+    ]
+  },
+  {
+    "id": "b9b6357c.7dc958",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3823.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "883d53e4.0057c"
+      ]
+    ]
+  },
+  {
+    "id": "8f1b73bf.36d998",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3559.566665649414,
+    "y": 4690.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "f9162d4b.d76cb",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4125.566665649414,
+    "y": 4789.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "883d53e4.0057c",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3589.566665649414,
+    "y": 4723.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "a081e505.7d3b8",
+        "370b0cd4.1d67f4",
+        "3bb246d3.6b0eb2"
+      ]
+    ]
+  },
+  {
+    "id": "370b0cd4.1d67f4",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3771.057632446289,
+    "y": 4701.140884399414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "21a39fa9.8cdbc"
+      ]
+    ]
+  },
+  {
+    "id": "3bb246d3.6b0eb2",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3759.566665649414,
+    "y": 4740.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3acf6433.2f683c"
+      ]
+    ]
+  },
+  {
+    "id": "21a39fa9.8cdbc",
+    "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": 3930.629165649414,
+    "y": 4699.426528930664,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "3acf6433.2f683c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3920.566665649414,
+    "y": 4741.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "c435208e.fb61a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3922.566665649414,
+    "y": 4785.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "6438caae.bf37d4",
+        "f9162d4b.d76cb"
+      ]
+    ]
+  },
+  {
+    "id": "a081e505.7d3b8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3764.566665649414,
+    "y": 4777.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "c435208e.fb61a8"
+      ]
+    ]
+  },
+  {
+    "id": "6438caae.bf37d4",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 4083.566665649414,
+    "y": 4717.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "3f5c519e.52fcfe",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4449.566665649414,
+    "y": 5285.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "128b476.c3c24b9",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4604.566665649414,
+    "y": 5326.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ef90095c.80a978",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5047.566665649414,
+    "y": 5374.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "b1e27ce1.629f7",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4420.566665649414,
+    "y": 5384.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "6c93874b.ea46a8",
+        "a48ce649.08b9f8"
+      ]
+    ]
+  },
+  {
+    "id": "6c93874b.ea46a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4656.566665649414,
+    "y": 5368.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "2bac874c.98bee"
+      ]
+    ]
+  },
+  {
+    "id": "2bac874c.98bee",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4800.566665649414,
+    "y": 5370.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "ef90095c.80a978",
+        "900ede93.5cfd68",
+        "c9e4ee74.f1da1"
+      ]
+    ]
+  },
+  {
+    "id": "a48ce649.08b9f8",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4655.566665649414,
+    "y": 5416.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "900ede93.5cfd68",
+    "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/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\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": 5168.566665649414,
+    "y": 5421.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c9e4ee74.f1da1",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5050.233657836914,
+    "y": 5506.650161743164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "80a5d0bc.394668",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5051.450454711914,
+    "y": 5465.449966430664,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "7af1ce17.a2c558",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5582.566665649414,
+    "y": 5853.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "9c03eaae.aa875",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4955.566665649414,
+    "y": 5863.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "c8852cc.de0315",
+        "d3e42d04.fd0a28"
+      ]
+    ]
+  },
+  {
+    "id": "c8852cc.de0315",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5188.566665649414,
+    "y": 5857.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3860ec82.4027f4"
+      ]
+    ]
+  },
+  {
+    "id": "3860ec82.4027f4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5335.566665649414,
+    "y": 5865.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "7af1ce17.a2c558",
+        "cf788720.b865d8",
+        "78c6b3da.3a0f94"
+      ]
+    ]
+  },
+  {
+    "id": "d3e42d04.fd0a28",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5189.566665649414,
+    "y": 5907.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cf788720.b865d8",
+    "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/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\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": 5703.566665649414,
+    "y": 5900.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "78c6b3da.3a0f94",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5585.233657836914,
+    "y": 5985.650161743164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "187aa522.975483",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5586.450454711914,
+    "y": 5944.449966430664,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "a4cbceb2.4df788",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5116.566665649414,
+    "y": 5813.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1eb398cf.3d4a57",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4950.566665649414,
+    "y": 5774.566665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": []
+  },
+  {
+    "id": "629500a0.f350c",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3277.816665649414,
+    "y": 6383.816665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "9cad2425.bfa4",
+        "5e118a1d.622834"
+      ]
+    ]
+  },
+  {
+    "id": "9cad2425.bfa4",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3468.816665649414,
+    "y": 6387.816665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "eaa9d7ab.22184"
+      ]
+    ]
+  },
+  {
+    "id": "eaa9d7ab.22184",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3595.816665649414,
+    "y": 6386.816665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "517fe5d1.d6143c"
+      ]
+    ]
+  },
+  {
+    "id": "5e118a1d.622834",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3464.816665649414,
+    "y": 6457.816665649414,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "3146887c.847d98"
+      ]
+    ]
+  },
+  {
+    "id": "9e160da7.86044",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4014.316665649414,
+    "y": 6456.900161743164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3146887c.847d98",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3598.316665649414,
+    "y": 6459.900161743164,
+    "z": "c7b9cd35.bfac88",
+    "wires": [
+      [
+        "9e160da7.86044"
+      ]
+    ]
   }
 ]
\ No newline at end of file