Use same name for OTN Tunnels and Ethernet Services in both domains. 99/116299/1
authorHesam Rahimi <hesam.rahimi@huawei.com>
Thu, 10 Dec 2020 22:27:04 +0000 (22:27 +0000)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Thu, 10 Dec 2020 23:30:42 +0000 (23:30 +0000)
Issue-ID: SDNC-1431
Change-Id: I5cc4d3c503d3b3e16e1223a50df654d19478b8cc
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Former-commit-id: b89b641bc03235f14409107dea771ae2f6db44d7

platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json

index a1b68a6..5d150f6 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d5615e24.a00ab8",\r
+        "id": "d9508d21.fa5b3",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 156,\r
-        "y": 95,\r
+        "x": 144,\r
+        "y": 116,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "90741178.637a68"\r
+                "cae32381.bce9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90741178.637a68",\r
+        "id": "cae32381.bce9d",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 287.2856903076172,\r
-        "y": 144.23810863494873,\r
+        "x": 275.2856903076172,\r
+        "y": 165.23810863494873,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e9aee376.235818"\r
+                "82cfa8a0.a91dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9aee376.235818",\r
+        "id": "82cfa8a0.a91dc",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 290.4286193847656,\r
-        "y": 229.00003242492676,\r
+        "x": 278.4286193847656,\r
+        "y": 250.00003242492676,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "9c8b5d20.5b6ef8"\r
+                "f6fef19d.8fc9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c8b5d20.5b6ef8",\r
+        "id": "f6fef19d.8fc9f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 440.238037109375,\r
-        "y": 358.6666564941406,\r
+        "x": 428.238037109375,\r
+        "y": 379.6666564941406,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f1c1dc9b.59851",\r
-                "40fee6aa.417918",\r
-                "a3f28ac6.d30ed8"\r
+                "c70167ce.7f9118",\r
+                "6aca196e.a4377",\r
+                "e86e6571.913898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1c1dc9b.59851",\r
+        "id": "c70167ce.7f9118",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 708.5716552734375,\r
-        "y": 745.59716796875,\r
+        "x": 696.5716552734375,\r
+        "y": 766.59716796875,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4fd4d94.2b8ec8",\r
+        "id": "d841551.d686928",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 740,\r
-        "y": 420,\r
+        "x": 728,\r
+        "y": 441,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40fee6aa.417918",\r
+        "id": "6aca196e.a4377",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 760,\r
-        "y": 516,\r
+        "x": 748,\r
+        "y": 537,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "15f2cda7.88709a",\r
-                "187b249d.3c85cb",\r
-                "c12e657e.e2c7f8"\r
+                "8dfdefd.d3d4d9",\r
+                "f6a9e3a5.f26778",\r
+                "6cad2633.e5f528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15f2cda7.88709a",\r
+        "id": "8dfdefd.d3d4d9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 979,\r
-        "y": 454,\r
+        "x": 967,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "56c6117d.ed7bc"\r
+                "f2dd8538.5d3378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "187b249d.3c85cb",\r
+        "id": "f6a9e3a5.f26778",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 988.490966796875,\r
-        "y": 496.57403564453125,\r
+        "x": 976.490966796875,\r
+        "y": 517.5740356445312,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "dd3e3cac.482ca8"\r
+                "59b21b6f.e70b7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c12e657e.e2c7f8",\r
+        "id": "6cad2633.e5f528",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977,\r
-        "y": 543,\r
+        "x": 965,\r
+        "y": 564,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "d7bbbdd4.b85c7"\r
+                "95c7d05e.93c3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd3e3cac.482ca8",\r
+        "id": "59b21b6f.e70b7c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1142.0623779296875,\r
-        "y": 499.8597717285156,\r
+        "x": 1130.0623779296875,\r
+        "y": 520.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7bbbdd4.b85c7",\r
+        "id": "95c7d05e.93c3e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1146,\r
-        "y": 544,\r
+        "x": 1134,\r
+        "y": 565,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56c6117d.ed7bc",\r
+        "id": "f2dd8538.5d3378",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1176,\r
-        "y": 450,\r
+        "x": 1164,\r
+        "y": 471,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "68f0da0a.13a494"\r
+                "94e5618.e7d282"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68f0da0a.13a494",\r
+        "id": "94e5618.e7d282",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1399.33349609375,\r
-        "y": 449.99993896484375,\r
+        "x": 1387.33349609375,\r
+        "y": 470.99993896484375,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a37a9810.801788"\r
+                "32140056.199ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a37a9810.801788",\r
+        "id": "32140056.199ae",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1600.0001335144043,\r
-        "y": 451.00002098083496,\r
+        "x": 1588.0001335144043,\r
+        "y": 472.00002098083496,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "2d3714db.b7aad4"\r
+                "9174febc.b8b998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d56fd4f.8da4ea",\r
+        "id": "25e7d332.a761fc",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 3861,\r
-        "y": 170,\r
+        "x": 3849,\r
+        "y": 191,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "119d7057.187e9",\r
+        "id": "fee47d9.4382e",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3942,\r
-        "y": 485,\r
+        "x": 3930,\r
+        "y": 506,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a078109.a1f9bf",\r
-                "c205f5c4.0bdb88"\r
+                "445402d7.16a9f4",\r
+                "d34714f7.10a51"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a078109.a1f9bf",\r
+        "id": "445402d7.16a9f4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4251.5,\r
-        "y": 454,\r
+        "x": 4239.5,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3b38ca16.a7fb4e"\r
+                "69fb5a0d.27a12c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c205f5c4.0bdb88",\r
+        "id": "d34714f7.10a51",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4256.5,\r
-        "y": 519,\r
+        "x": 4244.5,\r
+        "y": 540,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "176e9242.258856"\r
+                "f0eccde.2c0533"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b38ca16.a7fb4e",\r
+        "id": "69fb5a0d.27a12c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4427.5,\r
-        "y": 454,\r
+        "x": 4415.5,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "176e9242.258856",\r
+        "id": "f0eccde.2c0533",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4423,\r
-        "y": 519,\r
+        "x": 4411,\r
+        "y": 540,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ab834e.f483fcb",\r
+        "id": "a96cdedb.06ef48",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n",\r
         "comments": "",\r
-        "x": 3808.5,\r
-        "y": 673,\r
+        "x": 3796.5,\r
+        "y": 694,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9d60073.e2df48",\r
+        "id": "616c98c7.f82ea8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3962.5,\r
-        "y": 721,\r
+        "x": 3950.5,\r
+        "y": 742,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "1e624148.f51b17",\r
-                "9b38443d.36a338"\r
+                "eef8ae3.fdd1a5",\r
+                "8f2e62b6.e98788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e624148.f51b17",\r
+        "id": "eef8ae3.fdd1a5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4308,\r
-        "y": 702,\r
+        "x": 4296,\r
+        "y": 723,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "20712318.8d32fc"\r
+                "f08a069b.6042c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b38443d.36a338",\r
+        "id": "8f2e62b6.e98788",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4312,\r
-        "y": 742,\r
+        "x": 4300,\r
+        "y": 763,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a4fdbce9.b1c4"\r
+                "b227b2c.229c1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20712318.8d32fc",\r
+        "id": "f08a069b.6042c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4466,\r
-        "y": 702,\r
+        "x": 4454,\r
+        "y": 723,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4fdbce9.b1c4",\r
+        "id": "b227b2c.229c1d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4469.5,\r
-        "y": 742,\r
+        "x": 4457.5,\r
+        "y": 763,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f9579fb7.928158",\r
-                "b5483433.ff3288"\r
+                "2af71c81.1e5aec",\r
+                "5fe9896d.3d8e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "320ccbea.c02274",\r
+        "id": "c5970f4b.9679a8",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3806,\r
-        "y": 629,\r
+        "x": 3794,\r
+        "y": 650,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9579fb7.928158",\r
+        "id": "2af71c81.1e5aec",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4800,\r
-        "y": 707,\r
+        "x": 4788,\r
+        "y": 728,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d3281524.0d8478",\r
+        "id": "48dd1ec4.51cb4",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4664,\r
-        "y": 666,\r
+        "x": 4652,\r
+        "y": 687,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b5483433.ff3288",\r
+        "id": "5fe9896d.3d8e98",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4727,\r
-        "y": 753,\r
+        "x": 4715,\r
+        "y": 774,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5074df67.2ba988",\r
+        "id": "75d6c996.11aeb",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3799,\r
-        "y": 218,\r
+        "x": 3787,\r
+        "y": 239,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fd13730.014208",\r
+        "id": "c824ab5b.360f6",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3825,\r
-        "y": 335,\r
+        "x": 3813,\r
+        "y": 356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e11a5ea7.685f28",\r
-                "6cb0b7a8.80c24",\r
-                "a90c44f8.bdb148"\r
+                "19cd8085.d8fca7",\r
+                "ff1311fc.28b29",\r
+                "929f1027.4a5828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e11a5ea7.685f28",\r
+        "id": "19cd8085.d8fca7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4020.5001220703125,\r
-        "y": 287,\r
+        "x": 4008.5001220703125,\r
+        "y": 308,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "dfb8903c.c1b1d8"\r
+                "a2185ea8.7f403"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cb0b7a8.80c24",\r
+        "id": "ff1311fc.28b29",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4012.5001220703125,\r
-        "y": 342,\r
+        "x": 4000.5001220703125,\r
+        "y": 363,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "509847ff.264c58"\r
+                "c3cea897.f88808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfb8903c.c1b1d8",\r
+        "id": "a2185ea8.7f403",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4164.8824462890625,\r
-        "y": 286.6556701660156,\r
+        "x": 4152.8824462890625,\r
+        "y": 307.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "22c6d630.71326a"\r
+                "eb7f6fc2.5f3468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e775dc4.42bfbc",\r
+        "id": "a0fa7da8.75192",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4747,\r
-        "y": 289,\r
+        "x": 4735,\r
+        "y": 310,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f76a815f.36c178"\r
+                "809287e6.83f07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22c6d630.71326a",\r
+        "id": "eb7f6fc2.5f3468",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4349,\r
-        "y": 285,\r
+        "x": 4337,\r
+        "y": 306,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a3e1c0eb.9f5f88"\r
+                "21971ee2.f88962"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3e1c0eb.9f5f88",\r
+        "id": "21971ee2.f88962",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4544,\r
-        "y": 285,\r
+        "x": 4532,\r
+        "y": 306,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5e775dc4.42bfbc"\r
+                "a0fa7da8.75192"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a90c44f8.bdb148",\r
+        "id": "929f1027.4a5828",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4017.5001220703125,\r
-        "y": 399,\r
+        "x": 4005.5001220703125,\r
+        "y": 420,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7a5f3123.aad6e8"\r
+                "5ece63ab.72534c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a5f3123.aad6e8",\r
+        "id": "5ece63ab.72534c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4169.5001220703125,\r
-        "y": 400,\r
+        "x": 4157.5001220703125,\r
+        "y": 421,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "509847ff.264c58",\r
+        "id": "c3cea897.f88808",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4180.5001220703125,\r
-        "y": 343,\r
+        "x": 4168.5001220703125,\r
+        "y": 364,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ab5c9a1.06e3f",\r
+        "id": "fd9485b.71b4af8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5132,\r
-        "y": 302,\r
+        "x": 5120,\r
+        "y": 323,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "73f9ea02.2fb1e4",\r
-                "f8008145.65a48",\r
-                "81ec8b7a.5856d8"\r
+                "12fe3fd6.ccef78",\r
+                "5cf62e0d.6aa85",\r
+                "156d902b.c3731"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f76a815f.36c178",\r
+        "id": "809287e6.83f07",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4926,\r
-        "y": 289,\r
+        "x": 4914,\r
+        "y": 310,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ba856b81.43ed78",\r
-                "4ab5c9a1.06e3f"\r
+                "a1955015.d4546",\r
+                "fd9485b.71b4af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba856b81.43ed78",\r
+        "id": "a1955015.d4546",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
-        "x": 5162,\r
-        "y": 250,\r
+        "x": 5150,\r
+        "y": 271,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73f9ea02.2fb1e4",\r
+        "id": "12fe3fd6.ccef78",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5342,\r
-        "y": 293,\r
+        "x": 5330,\r
+        "y": 314,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5955dc9c.10f754"\r
+                "cc3a75a4.21fc7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8008145.65a48",\r
+        "id": "5cf62e0d.6aa85",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5334,\r
-        "y": 348,\r
+        "x": 5322,\r
+        "y": 369,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e3286b6.68c7618"\r
+                "bff3bfa.5f55cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81ec8b7a.5856d8",\r
+        "id": "156d902b.c3731",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5339,\r
-        "y": 405,\r
+        "x": 5327,\r
+        "y": 426,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ecd34f94.c447e"\r
+                "be590afe.7cc5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecd34f94.c447e",\r
+        "id": "be590afe.7cc5a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5491,\r
-        "y": 406,\r
+        "x": 5479,\r
+        "y": 427,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3286b6.68c7618",\r
+        "id": "bff3bfa.5f55cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5502,\r
-        "y": 351,\r
+        "x": 5490,\r
+        "y": 372,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5955dc9c.10f754",\r
+        "id": "cc3a75a4.21fc7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5486.38232421875,\r
-        "y": 290.6556701660156,\r
+        "x": 5474.38232421875,\r
+        "y": 311.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "adf5d068.f7cc"\r
+                "665ad654.79ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adf5d068.f7cc",\r
+        "id": "665ad654.79ee8",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
-        "x": 5701,\r
-        "y": 287,\r
+        "x": 5689,\r
+        "y": 308,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3f28ac6.d30ed8",\r
+        "id": "e86e6571.913898",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 726,\r
-        "y": 464,\r
+        "x": 714,\r
+        "y": 485,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8f0eb5.a171218",\r
+        "id": "27bc86e9.1c4e52",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 3841,\r
-        "y": 974,\r
+        "x": 3829,\r
+        "y": 995,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d94b849.7fdac78",\r
+        "id": "f8350413.ea8398",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3904,\r
-        "y": 1303,\r
+        "x": 3892,\r
+        "y": 1324,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "bfb79ead.715e28",\r
-                "d50b4560.d85de8"\r
+                "4e841df5.4d2d34",\r
+                "5e6f0ddb.0967b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfb79ead.715e28",\r
+        "id": "4e841df5.4d2d34",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4199.5,\r
-        "y": 1270,\r
+        "x": 4187.5,\r
+        "y": 1291,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3d3c3af3.12a3b6"\r
+                "8fb2eae.74bbb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d50b4560.d85de8",\r
+        "id": "5e6f0ddb.0967b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4204.5,\r
-        "y": 1335,\r
+        "x": 4192.5,\r
+        "y": 1356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "347f5539.8f6cd2"\r
+                "9fef13b3.660c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d3c3af3.12a3b6",\r
+        "id": "8fb2eae.74bbb98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4367.5,\r
-        "y": 1270,\r
+        "x": 4355.5,\r
+        "y": 1291,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "347f5539.8f6cd2",\r
+        "id": "9fef13b3.660c58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4378,\r
-        "y": 1335,\r
+        "x": 4366,\r
+        "y": 1356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7af2004a.23f66",\r
+        "id": "2fd670.86d5219",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3780,\r
-        "y": 1031,\r
+        "x": 3768,\r
+        "y": 1052,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e8fb92f.dc9c38",\r
+        "id": "8581969f.3e9f8",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3800,\r
-        "y": 1128,\r
+        "x": 3788,\r
+        "y": 1149,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3defc723.7feba8",\r
-                "92e9e56.6323798",\r
-                "92430372.354f08"\r
+                "3c9a5980.f5df5e",\r
+                "6737c173.340e3",\r
+                "68a240da.0733"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3defc723.7feba8",\r
+        "id": "3c9a5980.f5df5e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4002.5001220703125,\r
-        "y": 1081,\r
+        "x": 3990.5001220703125,\r
+        "y": 1102,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38216362.304eb4"\r
+                "ea38c477.b7b2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92e9e56.6323798",\r
+        "id": "6737c173.340e3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3994.5001220703125,\r
-        "y": 1136,\r
+        "x": 3982.5001220703125,\r
+        "y": 1157,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "48eafe9b.93564"\r
+                "8bbc992f.718ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38216362.304eb4",\r
+        "id": "ea38c477.b7b2f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4146.8824462890625,\r
-        "y": 1078.6556701660156,\r
+        "x": 4134.8824462890625,\r
+        "y": 1099.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5738b986.eff058"\r
+                "18cecfe3.6de9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5738b986.eff058",\r
+        "id": "18cecfe3.6de9e",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4331,\r
-        "y": 1093,\r
+        "x": 4319,\r
+        "y": 1114,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "424cd2de.fa894c"\r
+                "68f9f038.67b62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92430372.354f08",\r
+        "id": "68a240da.0733",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3999.5001220703125,\r
-        "y": 1193,\r
+        "x": 3987.5001220703125,\r
+        "y": 1214,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "93dd1d01.b545d"\r
+                "20686ade.8b231e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93dd1d01.b545d",\r
+        "id": "20686ade.8b231e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4151.5001220703125,\r
-        "y": 1194,\r
+        "x": 4139.5001220703125,\r
+        "y": 1215,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48eafe9b.93564",\r
+        "id": "8bbc992f.718ea",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4162.5001220703125,\r
-        "y": 1139,\r
+        "x": 4150.5001220703125,\r
+        "y": 1160,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38af15c1.7d84ba",\r
+        "id": "597aa62c.50d3c",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4729,\r
-        "y": 1097,\r
+        "x": 4717,\r
+        "y": 1118,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "d8eb3cd4.227208"\r
+                "e04d6fa3.eba9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "424cd2de.fa894c",\r
+        "id": "68f9f038.67b62",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4526,\r
-        "y": 1093,\r
+        "x": 4514,\r
+        "y": 1114,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38af15c1.7d84ba"\r
+                "597aa62c.50d3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9c07a83.518f98",\r
+        "id": "2f50548b.6d0f1c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5114,\r
-        "y": 1096,\r
+        "x": 5102,\r
+        "y": 1117,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ef0c3c57.987338",\r
-                "56343453.6f0ce4",\r
-                "3b68871e.15bfe"\r
+                "a769e440.df581",\r
+                "a7207c49.d2bbc",\r
+                "1e0583ed.3bab5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8eb3cd4.227208",\r
+        "id": "e04d6fa3.eba9f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4906,\r
-        "y": 1089,\r
+        "x": 4894,\r
+        "y": 1110,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f04e0884.6fcbb8",\r
-                "a9c07a83.518f98"\r
+                "eacacb80.08d4c",\r
+                "2f50548b.6d0f1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f04e0884.6fcbb8",\r
+        "id": "eacacb80.08d4c",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
-        "x": 5144,\r
-        "y": 1044,\r
+        "x": 5132,\r
+        "y": 1065,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b02d57da.181518",\r
+        "id": "61827e75.b97ad8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5473,\r
-        "y": 1200,\r
+        "x": 5461,\r
+        "y": 1221,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fed20348.5bb418",\r
+        "id": "b6c7c29b.5ee08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5484,\r
-        "y": 1145,\r
+        "x": 5472,\r
+        "y": 1166,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63aaed6a.7bdac4",\r
+        "id": "7c1b7b20.2d7bbc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5468.38232421875,\r
-        "y": 1084.6556701660156,\r
+        "x": 5456.38232421875,\r
+        "y": 1105.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "75824df.2d8fab4"\r
+                "9190ad56.af3378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75824df.2d8fab4",\r
+        "id": "9190ad56.af3378",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
-        "x": 5683,\r
-        "y": 1081,\r
+        "x": 5671,\r
+        "y": 1102,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef0c3c57.987338",\r
+        "id": "a769e440.df581",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5324,\r
-        "y": 1087,\r
+        "x": 5312,\r
+        "y": 1108,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "63aaed6a.7bdac4"\r
+                "7c1b7b20.2d7bbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56343453.6f0ce4",\r
+        "id": "a7207c49.d2bbc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5316,\r
-        "y": 1142,\r
+        "x": 5304,\r
+        "y": 1163,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "fed20348.5bb418"\r
+                "b6c7c29b.5ee08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b68871e.15bfe",\r
+        "id": "1e0583ed.3bab5c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5321,\r
-        "y": 1199,\r
+        "x": 5309,\r
+        "y": 1220,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "b02d57da.181518"\r
+                "61827e75.b97ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d3714db.b7aad4",\r
+        "id": "9174febc.b8b998",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1838,\r
-        "y": 453,\r
+        "x": 1826,\r
+        "y": 474,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ff6cd3bd.d426f",\r
-                "64ede831.c277d",\r
-                "c3e64c55.d790f8"\r
+                "c96ce0ff.9fbaf8",\r
+                "96dddcba.eaaec8",\r
+                "4ccaabcc.f5bb34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff6cd3bd.d426f",\r
+        "id": "c96ce0ff.9fbaf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046,\r
-        "y": 417,\r
+        "x": 2034,\r
+        "y": 438,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ab398477.a58648"\r
+                "5281d926.1c9dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64ede831.c277d",\r
+        "id": "96dddcba.eaaec8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046.490966796875,\r
-        "y": 462.57403564453125,\r
+        "x": 2034.490966796875,\r
+        "y": 483.57403564453125,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "575d4e0a.5d761"\r
+                "50a19d40.768324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3e64c55.d790f8",\r
+        "id": "4ccaabcc.f5bb34",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2044,\r
-        "y": 506,\r
+        "x": 2032,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "b99b7bb3.94d958"\r
+                "ffedf4ef.62de2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "575d4e0a.5d761",\r
+        "id": "50a19d40.768324",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2209.0623779296875,\r
-        "y": 462.8597717285156,\r
+        "x": 2197.0623779296875,\r
+        "y": 483.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b99b7bb3.94d958",\r
+        "id": "ffedf4ef.62de2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2213,\r
-        "y": 507,\r
+        "x": 2201,\r
+        "y": 528,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "684f9a1f.f6246c",\r
+        "id": "113dd07d.86f868",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2519,\r
-        "y": 506,\r
+        "x": 2507,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7a997c1a.ca4d0c",\r
-                "5d76d89f.d221e",\r
-                "d47edd7.a73b9a"\r
+                "2b6a4b71.479d3c",\r
+                "34c32e6f.a9d052",\r
+                "c2c66c33.7e24d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11f43428.ee3774",\r
+        "id": "7a40580d.1d5388",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2903,\r
-        "y": 506,\r
+        "x": 2891,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "9d8c4947.e731c",\r
-                "a3bb6162.8aa1a8"\r
+                "eeee2acf.9c0ba8",\r
+                "57847c7b.2f3dbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a997c1a.ca4d0c",\r
+        "id": "2b6a4b71.479d3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2730,\r
-        "y": 508,\r
+        "x": 2718,\r
+        "y": 529,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "11f43428.ee3774"\r
+                "7a40580d.1d5388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d76d89f.d221e",\r
+        "id": "34c32e6f.a9d052",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2730.490966796875,\r
-        "y": 553.5740356445312,\r
+        "x": 2718.490966796875,\r
+        "y": 574.5740356445312,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38cca479.139cac"\r
+                "17c937f3.281d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d47edd7.a73b9a",\r
+        "id": "c2c66c33.7e24d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2728,\r
-        "y": 597,\r
+        "x": 2716,\r
+        "y": 618,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3c7730a0.80743"\r
+                "45484d04.351e94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c7730a0.80743",\r
+        "id": "45484d04.351e94",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2895,\r
-        "y": 596,\r
+        "x": 2883,\r
+        "y": 617,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38cca479.139cac",\r
+        "id": "17c937f3.281d28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2893.0623779296875,\r
-        "y": 553.8597717285156,\r
+        "x": 2881.0623779296875,\r
+        "y": 574.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab398477.a58648",\r
+        "id": "5281d926.1c9dd",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2247,\r
-        "y": 412,\r
+        "x": 2235,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "32748804.ce58a"\r
+                "24c8cf8c.d35f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32748804.ce58a",\r
+        "id": "24c8cf8c.d35f5",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2452,\r
-        "y": 412,\r
+        "x": 2440,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "41c73b96.f41a84"\r
+                "ffd8562e.6c7ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41c73b96.f41a84",\r
+        "id": "ffd8562e.6c7ab",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2618,\r
-        "y": 412,\r
+        "x": 2606,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "cfeba90.49ffe58"\r
+                "1639e360.7db745"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfeba90.49ffe58",\r
+        "id": "1639e360.7db745",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2781,\r
-        "y": 412,\r
+        "x": 2769,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "684f9a1f.f6246c",\r
-                "b9f32cf4.c94178"\r
+                "113dd07d.86f868",\r
+                "b864657f.9c5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d8c4947.e731c",\r
+        "id": "eeee2acf.9c0ba8",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3157,\r
-        "y": 505,\r
+        "x": 3145,\r
+        "y": 526,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "c705e3fd.e27bf",\r
-                "74e33b9a.6a3ba4"\r
+                "888039c0.be2748",\r
+                "40c5843d.11f78c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c705e3fd.e27bf",\r
+        "id": "888039c0.be2748",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3410,\r
-        "y": 539,\r
+        "x": 3398,\r
+        "y": 560,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ab5b6203.69a998"\r
+                "d751d093.92a62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74e33b9a.6a3ba4",\r
+        "id": "40c5843d.11f78c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3410,\r
-        "y": 483,\r
+        "x": 3398,\r
+        "y": 504,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7b04fd35.ba570c"\r
+                "ddefc1a3.6644c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab5b6203.69a998",\r
+        "id": "d751d093.92a62",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3149,\r
-        "y": 1325,\r
+        "x": 3137,\r
+        "y": 1346,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "15797e4.5eae102",\r
-                "55009f8b.9fdc5"\r
+                "b9609f04.c7afe8",\r
+                "28e97c84.2c5ab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15797e4.5eae102",\r
+        "id": "b9609f04.c7afe8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1359,\r
+        "x": 3390,\r
+        "y": 1380,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "4151c132.8e3c28"\r
+                "ee3de09a.383318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55009f8b.9fdc5",\r
+        "id": "28e97c84.2c5ab4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1303,\r
+        "x": 3390,\r
+        "y": 1324,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "db74d7f2.74d0f8"\r
+                "b80c5827.1a79a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4151c132.8e3c28",\r
+        "id": "ee3de09a.383318",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3553,\r
-        "y": 1359,\r
+        "x": 3541,\r
+        "y": 1380,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad6a538e.8b5998",\r
+        "id": "8527e1fa.cc6b4",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "x": 3856,\r
-        "y": 110,\r
+        "x": 3844,\r
+        "y": 131,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51807068.f4c68",\r
+        "id": "615fdc8e.20c4e4",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
         "comments": "",\r
-        "x": 3837,\r
-        "y": 916,\r
+        "x": 3825,\r
+        "y": 937,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b04fd35.ba570c",\r
+        "id": "ddefc1a3.6644c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3578,\r
-        "y": 485,\r
+        "x": 3566,\r
+        "y": 506,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ad6a538e.8b5998",\r
-                "3d56fd4f.8da4ea",\r
-                "5074df67.2ba988",\r
-                "9fd13730.014208",\r
-                "ab834e.f483fcb",\r
-                "c9d60073.e2df48",\r
-                "119d7057.187e9"\r
+                "8527e1fa.cc6b4",\r
+                "25e7d332.a761fc",\r
+                "75d6c996.11aeb",\r
+                "c824ab5b.360f6",\r
+                "a96cdedb.06ef48",\r
+                "616c98c7.f82ea8",\r
+                "fee47d9.4382e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db74d7f2.74d0f8",\r
+        "id": "b80c5827.1a79a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3553,\r
-        "y": 1302,\r
+        "x": 3541,\r
+        "y": 1323,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "51807068.f4c68",\r
-                "b8f0eb5.a171218",\r
-                "7af2004a.23f66",\r
-                "9e8fb92f.dc9c38",\r
-                "d94b849.7fdac78",\r
-                "f91c20c6.244a28",\r
-                "158d95b4.dbf02a"\r
+                "615fdc8e.20c4e4",\r
+                "27bc86e9.1c4e52",\r
+                "2fd670.86d5219",\r
+                "8581969f.3e9f8",\r
+                "f8350413.ea8398",\r
+                "96b5aedc.4196d",\r
+                "e2e659bb.42dea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f91c20c6.244a28",\r
+        "id": "96b5aedc.4196d",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n",\r
         "comments": "",\r
-        "x": 3782,\r
-        "y": 1445,\r
+        "x": 3770,\r
+        "y": 1466,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "158d95b4.dbf02a",\r
+        "id": "e2e659bb.42dea",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3936,\r
-        "y": 1493,\r
+        "x": 3924,\r
+        "y": 1514,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7e8ddb70.effbcc",\r
-                "8eaa1ef7.3644e"\r
+                "a28581db.fa7cb",\r
+                "a3f78a52.db8928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e8ddb70.effbcc",\r
+        "id": "a28581db.fa7cb",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4281.5,\r
-        "y": 1474,\r
+        "x": 4269.5,\r
+        "y": 1495,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "596967d4.0f4de8"\r
+                "14523534.ce6de3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8eaa1ef7.3644e",\r
+        "id": "a3f78a52.db8928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4285.5,\r
-        "y": 1514,\r
+        "x": 4273.5,\r
+        "y": 1535,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "4f294e9d.697c08"\r
+                "2e9384b8.e29014"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "596967d4.0f4de8",\r
+        "id": "14523534.ce6de3",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4439.5,\r
-        "y": 1474,\r
+        "x": 4427.5,\r
+        "y": 1495,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f294e9d.697c08",\r
+        "id": "2e9384b8.e29014",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4443,\r
-        "y": 1514,\r
+        "x": 4431,\r
+        "y": 1535,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "637a80dd.df05",\r
-                "d2c33ee2.7a3708"\r
+                "b54e7482.e242c8",\r
+                "df1f167a.857918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78a845.7bb187bc",\r
+        "id": "364ac531.cfcb5a",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3779.5,\r
-        "y": 1401,\r
+        "x": 3767.5,\r
+        "y": 1422,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "637a80dd.df05",\r
+        "id": "b54e7482.e242c8",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4783,\r
-        "y": 1513,\r
+        "x": 4771,\r
+        "y": 1534,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "88ec2f6d.8d5da",\r
+        "id": "68be1db9.7e03ec",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4641,\r
-        "y": 1471,\r
+        "x": 4629,\r
+        "y": 1492,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2c33ee2.7a3708",\r
+        "id": "df1f167a.857918",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4712,\r
-        "y": 1562,\r
+        "x": 4700,\r
+        "y": 1583,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a3bb6162.8aa1a8",\r
+        "id": "57847c7b.2f3dbc",\r
         "type": "set",\r
         "name": "set attachment_param for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3144,\r
-        "y": 411,\r
+        "x": 3132,\r
+        "y": 432,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9f32cf4.c94178",\r
+        "id": "b864657f.9c5a",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 2965,\r
-        "y": 283,\r
+        "x": 2953,\r
+        "y": 304,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     }\r
index 7a6e77e..e92f7b2 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "8af466c4.459d38",\r
+        "id": "187a8cd0.b6793b",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 123,\r
-        "y": 94,\r
+        "x": 144,\r
+        "y": 132,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4f44bc11.1718bc"\r
+                "5ea5ad17.ee4964"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f44bc11.1718bc",\r
+        "id": "5ea5ad17.ee4964",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 407.2856903076172,\r
-        "y": 155.23810863494873,\r
+        "x": 428.2856903076172,\r
+        "y": 193.23810863494873,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "25a99bf3.257e24"\r
+                "9dad8fbc.f24f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25a99bf3.257e24",\r
+        "id": "9dad8fbc.f24f98",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 413.42860412597656,\r
-        "y": 240.00003051757812,\r
+        "x": 434.42860412597656,\r
+        "y": 278.0000305175781,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "e0aece26.83282"\r
+                "ca46cddf.f67038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0aece26.83282",\r
+        "id": "ca46cddf.f67038",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 783.238037109375,\r
-        "y": 264.66668701171875,\r
+        "x": 804.238037109375,\r
+        "y": 302.66668701171875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "19dfd83.33483a8",\r
-                "1050151b.02ec53",\r
-                "2f5068f1.5086e8"\r
+                "506e7f5c.19244",\r
+                "7c740453.8a159c",\r
+                "ac58016f.1c2c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19dfd83.33483a8",\r
+        "id": "506e7f5c.19244",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 1084.571533203125,\r
-        "y": 535.5969848632812,\r
+        "x": 1105.571533203125,\r
+        "y": 573.5969848632812,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1050151b.02ec53",\r
+        "id": "7c740453.8a159c",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106,\r
-        "y": 238,\r
+        "x": 1127,\r
+        "y": 276,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "50a47283.15fbe4",\r
-                "b5bb871c.db338",\r
-                "a61c0811.039808"\r
+                "78f50d5a.2a0cec",\r
+                "c34c58a5.11a148",\r
+                "f82c0a42.39fea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50a47283.15fbe4",\r
+        "id": "78f50d5a.2a0cec",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1331,\r
-        "y": 96,\r
+        "x": 1352,\r
+        "y": 134,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "80a63fa0.68596"\r
+                "dfc9a5db.996c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5bb871c.db338",\r
+        "id": "c34c58a5.11a148",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1340.490966796875,\r
-        "y": 138.57403564453125,\r
+        "x": 1361.490966796875,\r
+        "y": 176.57403564453125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "d32b21e7.8cada8"\r
+                "5383933.3cbeeec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a61c0811.039808",\r
+        "id": "f82c0a42.39fea8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1329,\r
-        "y": 185,\r
+        "x": 1350,\r
+        "y": 223,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "229167e8.df6688"\r
+                "3912b121.be04f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80a63fa0.68596",\r
+        "id": "dfc9a5db.996c4",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1570,\r
-        "y": 93,\r
+        "x": 1591,\r
+        "y": 131,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "d44d65ef.318f48",\r
-                "e1082721.453ff"\r
+                "fea7170c.7030f8",\r
+                "8bbb818c.845db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d32b21e7.8cada8",\r
+        "id": "5383933.3cbeeec",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1494.0623779296875,\r
-        "y": 141.85977172851562,\r
+        "x": 1515.0623779296875,\r
+        "y": 179.85977172851562,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "229167e8.df6688",\r
+        "id": "3912b121.be04f6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1498,\r
-        "y": 186,\r
+        "x": 1519,\r
+        "y": 224,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a49b8769.572b48",\r
+        "id": "ca7ed950.c4257",\r
         "type": "set",\r
         "name": "set the 1st allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 1969,\r
-        "y": 160,\r
+        "x": 1990,\r
+        "y": 198,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d44d65ef.318f48",\r
+        "id": "fea7170c.7030f8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1783,\r
-        "y": 117,\r
+        "x": 1804,\r
+        "y": 155,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "7234fca3.e71404"\r
+                "bf993d83.a36c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1082721.453ff",\r
+        "id": "8bbb818c.845db",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1785,\r
-        "y": 57,\r
+        "x": 1806,\r
+        "y": 95,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e3f19b5a.145ff8",\r
+        "id": "f5ddac6.6343fd",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1085,\r
-        "y": 126,\r
+        "x": 1106,\r
+        "y": 164,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7234fca3.e71404",\r
+        "id": "bf993d83.a36c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1768,\r
-        "y": 205,\r
+        "x": 1789,\r
+        "y": 243,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a49b8769.572b48",\r
-                "bd4dde9a.1bdbc8"\r
+                "ca7ed950.c4257",\r
+                "78e29884.225c08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcc70311.f003c",\r
+        "id": "50cd8b4c.3fbe34",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2330,\r
-        "y": 803,\r
+        "x": 2370,\r
+        "y": 822,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "409bbb6d.55b47c",\r
+        "id": "4f854478.eff1a4",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2332,\r
-        "y": 854,\r
+        "x": 2371,\r
+        "y": 877,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd4dde9a.1bdbc8",\r
+        "id": "78e29884.225c08",\r
         "type": "save",\r
         "name": "get allotted-resource from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1972,\r
-        "y": 235,\r
+        "x": 1993,\r
+        "y": 273,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4f2f09b0.4a4f9",\r
-                "a509e8e5.13e7a8",\r
-                "2d1dc418.c3457c"\r
+                "e80669a1.e9e15",\r
+                "2a720603.9816ea",\r
+                "13ab43c3.0c3b8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f2f09b0.4a4f9",\r
+        "id": "e80669a1.e9e15",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2188,\r
-        "y": 302,\r
+        "x": 2209,\r
+        "y": 340,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2c4c53ed.c92a04"\r
+                "14dca185.e1b46e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a509e8e5.13e7a8",\r
+        "id": "2a720603.9816ea",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2188.490966796875,\r
-        "y": 201.573974609375,\r
+        "x": 2209.490966796875,\r
+        "y": 239.573974609375,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b0eb4825.a76068"\r
+                "e741b978.cc2c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d1dc418.c3457c",\r
+        "id": "13ab43c3.0c3b8c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2184,\r
-        "y": 251,\r
+        "x": 2205,\r
+        "y": 289,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "8d5abfeb.01e9e"\r
+                "b16bf403.baad58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0eb4825.a76068",\r
+        "id": "e741b978.cc2c38",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2366.0625,\r
-        "y": 201.8597412109375,\r
+        "x": 2387.0625,\r
+        "y": 239.8597412109375,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d5abfeb.01e9e",\r
+        "id": "b16bf403.baad58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2366,\r
-        "y": 251,\r
+        "x": 2387,\r
+        "y": 289,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abb2414c.5ad6c8",\r
+        "id": "6e843ab.3582ec4",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1707,\r
-        "y": 724,\r
+        "x": 1728,\r
+        "y": 762,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "adf5b844.beeba",\r
-                "12473ca6.c43deb",\r
-                "1c108294.607cad"\r
+                "a6a55952.b90f",\r
+                "4070a4d0.4176d4",\r
+                "60c71e39.2f942"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12473ca6.c43deb",\r
+        "id": "4070a4d0.4176d4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1998.490966796875,\r
-        "y": 702.573974609375,\r
+        "x": 2019.490966796875,\r
+        "y": 740.573974609375,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "bde422ea.a4cc28"\r
+                "77c211be.bc11e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c108294.607cad",\r
+        "id": "60c71e39.2f942",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1987,\r
-        "y": 747,\r
+        "x": 2008,\r
+        "y": 785,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "da8d3db8.78e6c"\r
+                "fbd7810f.a3734"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bde422ea.a4cc28",\r
+        "id": "77c211be.bc11e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2147.0625,\r
-        "y": 702.8597412109375,\r
+        "x": 2168.0625,\r
+        "y": 740.8597412109375,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da8d3db8.78e6c",\r
+        "id": "fbd7810f.a3734",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2146,\r
-        "y": 747,\r
+        "x": 2167,\r
+        "y": 785,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adf5b844.beeba",\r
+        "id": "a6a55952.b90f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1994,\r
-        "y": 826,\r
+        "x": 2015,\r
+        "y": 864,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b6fe1d93.64f5d8"\r
+                "22d259e0.d6e2e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6fe1d93.64f5d8",\r
+        "id": "22d259e0.d6e2e6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2133,\r
-        "y": 826,\r
+        "x": 2154,\r
+        "y": 864,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "fcc70311.f003c",\r
-                "409bbb6d.55b47c",\r
-                "34d7360f.96bb2a",\r
-                "48146421.80a074",\r
-                "31bc0e97.d1b352",\r
-                "c57c6aeb.0d49c",\r
-                "5ce97afb.25ecd4",\r
-                "1f2f2fca.dd946",\r
-                "fc0327f0.f229c8",\r
-                "7a9db702.f0e1b",\r
-                "1f17f018.71ce48",\r
-                "75da5f28.16fb78",\r
-                "15d01a88.67da65",\r
-                "8335f76.9af8388",\r
-                "47a3a765.16faa",\r
-                "5651ec55.50184c",\r
-                "edb297b0.c9f328",\r
-                "91eba2f3.844de"\r
+                "50cd8b4c.3fbe34",\r
+                "4f854478.eff1a4",\r
+                "14a4c097.be654f",\r
+                "644a5f8e.b0774",\r
+                "79e86730.1965c8",\r
+                "4f1b84d7.aafb5c",\r
+                "7ca2c5af.473d34",\r
+                "28a40435.4178ec",\r
+                "b46ca414.99697",\r
+                "57fdafb2.9eec08",\r
+                "260f00b5.585908",\r
+                "134248ca.e0fa77",\r
+                "fc2a7bf0.e878b",\r
+                "a5814717.4b953",\r
+                "84749d0f.3038c8",\r
+                "39b144a2.fc3a7c",\r
+                "21292318.735edc",\r
+                "ce066c5d.e7734",\r
+                "c19c2198.0de5c",\r
+                "303c5717.c426f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34d7360f.96bb2a",\r
+        "id": "14a4c097.be654f",\r
         "type": "save",\r
         "name": "get network-route-A from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2362,\r
-        "y": 907,\r
+        "x": 2383,\r
+        "y": 945,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "1b983b4f.2c744d",\r
-                "83f9f068.59488",\r
-                "b0f14e34.bcfcc8"\r
+                "7df96ca0.99ecc4",\r
+                "50b0a0cb.3236a8",\r
+                "a3437ac7.e0ee1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48146421.80a074",\r
+        "id": "644a5f8e.b0774",\r
         "type": "save",\r
         "name": "get network-route-B from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2341,\r
-        "y": 1508.9998779296875,\r
+        "x": 2362,\r
+        "y": 1546.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "191b0cc5.853723",\r
-                "bdfa4737.7997e",\r
-                "3dcbfde4.8fdb42"\r
+                "ece670c3.4f34a8",\r
+                "263c76fe.5b3242",\r
+                "97139121.0331f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b983b4f.2c744d",\r
+        "id": "7df96ca0.99ecc4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2563,\r
-        "y": 791,\r
+        "x": 2584,\r
+        "y": 829,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "5a65addc.f9d584"\r
+                "a6fc1138.23945"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83f9f068.59488",\r
+        "id": "50b0a0cb.3236a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2558.509033203125,\r
-        "y": 840.426025390625,\r
+        "x": 2579.509033203125,\r
+        "y": 878.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "60568789.b01d3"\r
+                "6e6d0210.60f404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0f14e34.bcfcc8",\r
+        "id": "a3437ac7.e0ee1",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2562.509033203125,\r
-        "y": 891.426025390625,\r
+        "x": 2583.509033203125,\r
+        "y": 929.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4d860946.d83b4"\r
+                "d860cdb2.412c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a65addc.f9d584",\r
+        "id": "a6fc1138.23945",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2711.571533203125,\r
-        "y": 790.2857666015625,\r
+        "x": 2732.571533203125,\r
+        "y": 828.2857666015625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60568789.b01d3",\r
+        "id": "6e6d0210.60f404",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2701.509033203125,\r
-        "y": 840.426025390625,\r
+        "x": 2722.509033203125,\r
+        "y": 878.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "191b0cc5.853723",\r
+        "id": "ece670c3.4f34a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2564,\r
-        "y": 1478.9998779296875,\r
+        "x": 2585,\r
+        "y": 1516.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "63b24300.9bd254"\r
+                "f4c07ea8.414868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdfa4737.7997e",\r
+        "id": "263c76fe.5b3242",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2559.509033203125,\r
-        "y": 1528.4259033203125,\r
+        "x": 2580.509033203125,\r
+        "y": 1566.4259033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f56e5adb.9f7af8"\r
+                "ce13d349.caf3b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dcbfde4.8fdb42",\r
+        "id": "97139121.0331f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2563.509033203125,\r
-        "y": 1579.4259033203125,\r
+        "x": 2584.509033203125,\r
+        "y": 1617.4259033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b596324f.8c351"\r
+                "d30e3d8d.09cef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63b24300.9bd254",\r
+        "id": "f4c07ea8.414868",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2712.571533203125,\r
-        "y": 1478.28564453125,\r
+        "x": 2733.571533203125,\r
+        "y": 1516.28564453125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f56e5adb.9f7af8",\r
+        "id": "ce13d349.caf3b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2702.509033203125,\r
-        "y": 1528.4259033203125,\r
+        "x": 2723.509033203125,\r
+        "y": 1566.4259033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f08611d.e85e5f",\r
+        "id": "e31af50c.926d2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3376.66650390625,\r
-        "y": 935,\r
+        "x": 3397.66650390625,\r
+        "y": 973,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "bcee177.eb94168",\r
-                "f75d67.7cccfa98",\r
-                "a4c22219.803cd8",\r
-                "d6e02ca6.c9a8c8",\r
-                "5b5222c9.d7a36c"\r
+                "c203b1ea.86f6c",\r
+                "d4cb3bd3.a349c8",\r
+                "5d25d92f.6f798",\r
+                "a5aee8f6.ab5e58",\r
+                "c830d981.aee038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b31e4a0.a10748",\r
+        "id": "b7824d8a.d2e4f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3204,\r
-        "y": 936,\r
+        "x": 3225,\r
+        "y": 974,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f08611d.e85e5f"\r
+                "e31af50c.926d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9553d7.4a532c",\r
+        "id": "5d5b9681.b7598",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3213.490966796875,\r
-        "y": 978.5740356445312,\r
+        "x": 3234.490966796875,\r
+        "y": 1016.5740356445312,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b569fb01.0907f8"\r
+                "4fc1bcc7.eeb784"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf1d45bd.26226",\r
+        "id": "6e8be76c.59d528",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3202,\r
-        "y": 1025,\r
+        "x": 3223,\r
+        "y": 1063,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "8595bfe0.610eb"\r
+                "ac4a57cf.bef8e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b569fb01.0907f8",\r
+        "id": "4fc1bcc7.eeb784",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3367.0623779296875,\r
-        "y": 981.8597717285156,\r
+        "x": 3388.0623779296875,\r
+        "y": 1019.8597717285156,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8595bfe0.610eb",\r
+        "id": "ac4a57cf.bef8e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3371,\r
-        "y": 1026,\r
+        "x": 3392,\r
+        "y": 1064,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d860946.d83b4",\r
+        "id": "d860cdb2.412c48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2724,\r
-        "y": 893,\r
+        "x": 2745,\r
+        "y": 931,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "de6bae96.a20288",\r
-                "2546bd9f.525272"\r
+                "62113903.77ec78",\r
+                "c9fe9947.c06348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b596324f.8c351",\r
+        "id": "d30e3d8d.09cef8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2714,\r
-        "y": 1580.9998779296875,\r
+        "x": 2735,\r
+        "y": 1618.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "cc046399.813d8",\r
-                "94119745.c4be9"\r
+                "4ecc6dae.def654",\r
+                "669a0eda.d8f578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0ee2422.3da6b8",\r
+        "id": "a1006da4.a872e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3344.66650390625,\r
-        "y": 1771,\r
+        "x": 3365.66650390625,\r
+        "y": 1809,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "1c0836ef.f83329",\r
-                "4c626db2.041e5c",\r
-                "a8a1220c.849508",\r
-                "46fb3252.5c32c4",\r
-                "3da30ce3.e252e4"\r
+                "a3aca2eb.21f5a8",\r
+                "d3723bfd.d9b168",\r
+                "d3c0c42f.4b437",\r
+                "2512774e.7c83b8",\r
+                "d281a70f.336618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33a31a8c.e3b546",\r
+        "id": "c9dbe459.2e8d58",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3172,\r
-        "y": 1772,\r
+        "x": 3193,\r
+        "y": 1810,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "d0ee2422.3da6b8"\r
+                "a1006da4.a872e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "333e39a9.5e6146",\r
+        "id": "dab2f9a8.cea26",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3181.490966796875,\r
-        "y": 1814.5740356445312,\r
+        "x": 3202.490966796875,\r
+        "y": 1852.5740356445312,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "c1fc954e.de2348"\r
+                "6f793776.f883f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18c9eff6.77ede8",\r
+        "id": "f5d094cc.fe5d68",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3170,\r
-        "y": 1861,\r
+        "x": 3191,\r
+        "y": 1899,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a54283a5.d344c"\r
+                "f383fe68.3b83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1fc954e.de2348",\r
+        "id": "6f793776.f883f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3335.0623779296875,\r
-        "y": 1817.8597717285156,\r
+        "x": 3356.0623779296875,\r
+        "y": 1855.8597717285156,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a54283a5.d344c",\r
+        "id": "f383fe68.3b83",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3339,\r
-        "y": 1862,\r
+        "x": 3360,\r
+        "y": 1900,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcee177.eb94168",\r
+        "id": "c203b1ea.86f6c",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3641,\r
-        "y": 919,\r
+        "x": 3662,\r
+        "y": 957,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "60be6e60.f9ecc8",\r
-                "ba14138e.5a08c8"\r
+                "6fb08f41.de4d4",\r
+                "183e3f66.48a0d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba14138e.5a08c8",\r
+        "id": "183e3f66.48a0d1",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3864,\r
-        "y": 874,\r
+        "x": 3885,\r
+        "y": 912,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "9427c16f.fe3b38"\r
+                "e55834d1.3ca1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60be6e60.f9ecc8",\r
+        "id": "6fb08f41.de4d4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3866,\r
-        "y": 938,\r
+        "x": 3887,\r
+        "y": 976,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "8f5282b4.e9d138"\r
+                "f45e344f.88a748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e9c487d.182678",\r
+        "id": "5bf466f.7bcdb98",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
         "comments": "",\r
-        "x": 4199,\r
-        "y": 832,\r
+        "x": 4220,\r
+        "y": 870,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f5282b4.e9d138",\r
+        "id": "f45e344f.88a748",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4028,\r
-        "y": 934,\r
+        "x": 4049,\r
+        "y": 972,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9427c16f.fe3b38",\r
+        "id": "e55834d1.3ca1b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4029,\r
-        "y": 871,\r
+        "x": 4050,\r
+        "y": 909,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "7be29fde.94965",\r
-                "9e9c487d.182678"\r
+                "194d0d3d.11557b",\r
+                "5bf466f.7bcdb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7be29fde.94965",\r
+        "id": "194d0d3d.11557b",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
         "comments": "",\r
-        "x": 4200,\r
-        "y": 937,\r
+        "x": 4221,\r
+        "y": 975,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "305634db.acff34",\r
+        "id": "dd1a9ea9.6d631",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
-        "x": 4201,\r
-        "y": 886,\r
+        "x": 4222,\r
+        "y": 924,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4c22219.803cd8",\r
+        "id": "5d25d92f.6f798",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\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='' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
+        "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='' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3643,\r
-        "y": 1078,\r
+        "x": 3664,\r
+        "y": 1116,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f75d67.7cccfa98",\r
+        "id": "d4cb3bd3.a349c8",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domainA",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3688,\r
-        "y": 988,\r
+        "x": 3709,\r
+        "y": 1026,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "51860532.882634",\r
+        "id": "6324b9d6.c58fe",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",\r
         "comments": "",\r
-        "x": 3577,\r
-        "y": 1029,\r
+        "x": 3598,\r
+        "y": 1067,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c0836ef.f83329",\r
+        "id": "a3aca2eb.21f5a8",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3631,\r
-        "y": 1775.0001220703125,\r
+        "x": 3652,\r
+        "y": 1813.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "9b737b83.c6ca88",\r
-                "22a6cd9c.81b312"\r
+                "37186f70.3d57",\r
+                "4ffb9846.2cd768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22a6cd9c.81b312",\r
+        "id": "4ffb9846.2cd768",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3854,\r
-        "y": 1730.0001220703125,\r
+        "x": 3875,\r
+        "y": 1768.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f2364b58.93416"\r
+                "17371f4a.955d61"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b737b83.c6ca88",\r
+        "id": "37186f70.3d57",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3856,\r
-        "y": 1794.0001220703125,\r
+        "x": 3877,\r
+        "y": 1832.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "e81f51e1.476528"\r
+                "1981566c.49d212"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c355fa60.d02f7",\r
+        "id": "17f707eb.a2a908",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
         "comments": "",\r
-        "x": 4189,\r
-        "y": 1688.0001220703125,\r
+        "x": 4210,\r
+        "y": 1726.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e81f51e1.476528",\r
+        "id": "1981566c.49d212",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4015,\r
-        "y": 1813.0001220703125,\r
+        "x": 4036,\r
+        "y": 1851.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2364b58.93416",\r
+        "id": "17371f4a.955d61",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4019,\r
-        "y": 1727.0001220703125,\r
+        "x": 4040,\r
+        "y": 1765.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "c355fa60.d02f7",\r
-                "fbcef05a.30da7"\r
+                "17f707eb.a2a908",\r
+                "ca2d1022.cf4e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbcef05a.30da7",\r
+        "id": "ca2d1022.cf4e88",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
         "comments": "",\r
-        "x": 4190,\r
-        "y": 1793.0001220703125,\r
+        "x": 4211,\r
+        "y": 1831.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5702bff2.1c714",\r
+        "id": "8cfd8f17.95a8e",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
-        "x": 4185,\r
-        "y": 1742.0001220703125,\r
+        "x": 4206,\r
+        "y": 1780.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8a1220c.849508",\r
+        "id": "d3c0c42f.4b437",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\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='' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
+        "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='' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3633,\r
-        "y": 1934.0001220703125,\r
+        "x": 3654,\r
+        "y": 1972.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4c626db2.041e5c",\r
+        "id": "d3723bfd.d9b168",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domainB",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3678,\r
-        "y": 1844.0001220703125,\r
+        "x": 3699,\r
+        "y": 1882.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a742fa6d.53c048",\r
+        "id": "1765f0ec.e922ff",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",\r
         "comments": "",\r
-        "x": 3567,\r
-        "y": 1882.0001220703125,\r
+        "x": 3588,\r
+        "y": 1920.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "31bc0e97.d1b352",\r
+        "id": "79e86730.1965c8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2542,\r
-        "y": 2009,\r
+        "x": 2563,\r
+        "y": 2047,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c57c6aeb.0d49c",\r
+        "id": "4f1b84d7.aafb5c",\r
         "type": "set",\r
         "name": "set attachment_param",\r
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",\r
         "comments": "",\r
-        "x": 2336,\r
-        "y": 1949,\r
+        "x": 2357,\r
+        "y": 1987,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df325b41.3eb068",\r
+        "id": "3db83432.384b6c",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",\r
         "comments": "",\r
-        "x": 2310,\r
-        "y": 1902,\r
+        "x": 2331,\r
+        "y": 1940,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ce97afb.25ecd4",\r
+        "id": "7ca2c5af.473d34",\r
         "type": "save",\r
         "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2418,\r
-        "y": 2168,\r
+        "x": 2439,\r
+        "y": 2206,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "265fc651.8685d2"\r
+                "57191dce.959cfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f2f2fca.dd946",\r
+        "id": "28a40435.4178ec",\r
         "type": "save",\r
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2421.5,\r
-        "y": 2238,\r
+        "x": 2442.5,\r
+        "y": 2276,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47b16974.ba7ff8",\r
+        "id": "82428356.c63018",\r
         "type": "save",\r
         "name": "save srcLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3069.5,\r
-        "y": 2157,\r
+        "x": 3090.5,\r
+        "y": 2195,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "45a1ff6d.febe7",\r
+        "id": "356966b3.03f20a",\r
         "type": "save",\r
         "name": "save dstLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3071.5,\r
-        "y": 2196,\r
+        "x": 3092.5,\r
+        "y": 2234,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d6e02ca6.c9a8c8",\r
+        "id": "a5aee8f6.ab5e58",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3771,\r
-        "y": 1126,\r
+        "x": 3792,\r
+        "y": 1164,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "46fb3252.5c32c4",\r
+        "id": "2512774e.7c83b8",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3760,\r
-        "y": 1999.0001220703125,\r
+        "x": 3781,\r
+        "y": 2037.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "265fc651.8685d2",\r
+        "id": "57191dce.959cfc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2718,\r
-        "y": 2175,\r
+        "x": 2739,\r
+        "y": 2213,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "adcdcd16.7b29a8"\r
+                "dcb72301.82c018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adcdcd16.7b29a8",\r
+        "id": "dcb72301.82c018",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2858.500244140625,\r
-        "y": 2176.25390625,\r
+        "x": 2879.500244140625,\r
+        "y": 2214.25390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4042eea1.42325",\r
+        "id": "6975c99d.325498",\r
         "type": "comment",\r
         "name": "TODO: FIXME: do we need this relationship?",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3106,\r
-        "y": 2116,\r
+        "x": 3127,\r
+        "y": 2154,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bb65fc7.c411f",\r
+        "id": "e85b69e.5211998",\r
         "type": "comment",\r
         "name": "TODO: FIXME: put proper values",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2385,\r
-        "y": 2128,\r
+        "x": 2406,\r
+        "y": 2166,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc0327f0.f229c8",\r
+        "id": "b46ca414.99697",\r
         "type": "save",\r
         "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2421,\r
-        "y": 2456,\r
+        "x": 2442,\r
+        "y": 2494,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a95bb5bd.f30938"\r
+                "e64b3d38.e980a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54e84a72.0a1bec",\r
+        "id": "58f4ff2f.89d75",\r
         "type": "comment",\r
         "name": "TODO: FIXME: do we need this relationship?",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3109,\r
-        "y": 2396,\r
+        "x": 3130,\r
+        "y": 2434,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ffd7140.0fcf",\r
+        "id": "cad39d05.aea5f",\r
         "type": "save",\r
         "name": "save srcLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3072.5,\r
-        "y": 2437,\r
+        "x": 3093.5,\r
+        "y": 2475,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d209c7d6.5be38",\r
+        "id": "489163b9.d640b4",\r
         "type": "save",\r
         "name": "save dstLTP relationship in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3074.5,\r
-        "y": 2476,\r
+        "x": 3095.5,\r
+        "y": 2514,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "92281260.0bacb8",\r
+        "id": "d0ea482.a9901b8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2861.500244140625,\r
-        "y": 2456.25390625,\r
+        "x": 2882.500244140625,\r
+        "y": 2494.25390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a95bb5bd.f30938",\r
+        "id": "e64b3d38.e980a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2721,\r
-        "y": 2455,\r
+        "x": 2742,\r
+        "y": 2493,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "92281260.0bacb8"\r
+                "d0ea482.a9901b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "460ff82c.4ff7",\r
+        "id": "9cd3d1db.fb7ce8",\r
         "type": "comment",\r
         "name": "TODO: FIXME: put proper values",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2401,\r
-        "y": 2416,\r
+        "x": 2422,\r
+        "y": 2454,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a9db702.f0e1b",\r
+        "id": "57fdafb2.9eec08",\r
         "type": "save",\r
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2419.5,\r
-        "y": 2496,\r
+        "x": 2440.5,\r
+        "y": 2534,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b765768.33e8008",\r
+        "id": "aa4b663b.c9d06",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",\r
         "comments": "",\r
-        "x": 2293,\r
-        "y": 2579,\r
+        "x": 2314,\r
+        "y": 2617,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15d01a88.67da65",\r
+        "id": "fc2a7bf0.e878b",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='otn-dest-node' value='`$domain-A.node-id`' />\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 2358,\r
-        "y": 2624,\r
+        "x": 2379,\r
+        "y": 2662,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c6d32ec.4900b4",\r
+        "id": "2c916faf.da498",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4815,\r
-        "y": 646,\r
+        "x": 4836,\r
+        "y": 684,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f99473bc.f6917",\r
-                "8ca213cb.13c578",\r
-                "73897c92.dacd5c"\r
+                "883ac008.74f89",\r
+                "6cf958ca.c3e4a8",\r
+                "e70b241a.97d7e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c4c53ed.c92a04",\r
+        "id": "14dca185.e1b46e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2368,\r
-        "y": 302,\r
+        "x": 2389,\r
+        "y": 340,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "df1d026f.c1c088"\r
+                "8a257359.8a7208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b086b8f.46122c",\r
+        "id": "e1ac55d9.d865b8",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1298.0001220703125,\r
-        "y": 719.0001220703125,\r
+        "x": 1319.0001220703125,\r
+        "y": 757.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "849b2fa9.e38c6"\r
+                "f6ec4c40.65362"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3637c149.a4c596",\r
+        "id": "14b8fde.fcc1702",\r
         "type": "switchNode",\r
         "name": "switch allotted-resource.relationship-list not empty",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2036,\r
-        "y": 425,\r
+        "x": 2057,\r
+        "y": 463,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a6e3fac3.17782",\r
-                "36a75df5.accdba"\r
+                "e65ebebd.579d6",\r
+                "32fc4868.fa2b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36a75df5.accdba",\r
+        "id": "32fc4868.fa2b8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2346,\r
-        "y": 432,\r
+        "x": 2367,\r
+        "y": 470,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a6e3fac3.17782",\r
+        "id": "e65ebebd.579d6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2345,\r
-        "y": 486,\r
+        "x": 2366,\r
+        "y": 524,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ccfe530c.696ee"\r
+                "c14b8719.903d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88e35dde.f9395",\r
+        "id": "badc6972.d68008",\r
         "type": "set",\r
         "name": "set the 1st logical-link-name",\r
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 1718,\r
-        "y": 669,\r
+        "x": 1739,\r
+        "y": 707,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "849b2fa9.e38c6",\r
+        "id": "f6ec4c40.65362",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1475,\r
-        "y": 712,\r
+        "x": 1496,\r
+        "y": 750,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "88e35dde.f9395",\r
-                "abb2414c.5ad6c8"\r
+                "badc6972.d68008",\r
+                "6e843ab.3582ec4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4059fd.7caace",\r
+        "id": "76aa64b6.332a54",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
-        "x": 2904,\r
-        "y": 898,\r
+        "x": 2925,\r
+        "y": 936,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de6bae96.a20288",\r
+        "id": "62113903.77ec78",\r
         "type": "save",\r
         "name": "get p-interface-src from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2947,\r
-        "y": 963,\r
+        "x": 2968,\r
+        "y": 1001,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "8b31e4a0.a10748",\r
-                "c9553d7.4a532c",\r
-                "cf1d45bd.26226"\r
+                "b7824d8a.d2e4f8",\r
+                "5d5b9681.b7598",\r
+                "6e8be76c.59d528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc046399.813d8",\r
+        "id": "4ecc6dae.def654",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2944,\r
-        "y": 1807,\r
+        "x": 2965,\r
+        "y": 1845,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "33a31a8c.e3b546",\r
-                "333e39a9.5e6146",\r
-                "18c9eff6.77ede8"\r
+                "c9dbe459.2e8d58",\r
+                "dab2f9a8.cea26",\r
+                "f5d094cc.fe5d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76191dd2.8fade4",\r
+        "id": "6f6e53ed.b087ec",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
-        "x": 2905,\r
-        "y": 1751,\r
+        "x": 2926,\r
+        "y": 1789,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df1d026f.c1c088",\r
+        "id": "8a257359.8a7208",\r
         "type": "save",\r
         "name": "get allotted-resource relationship from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2661,\r
-        "y": 249,\r
+        "x": 2682,\r
+        "y": 287,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "adfd76db.6991",\r
-                "7a639d69.b5bebc",\r
-                "4943cdeb.ab6f2c"\r
+                "8ea1434f.746858",\r
+                "f2d8ff7.3c8d5",\r
+                "a6d32e01.02e81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a639d69.b5bebc",\r
+        "id": "f2d8ff7.3c8d5",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2934.490966796875,\r
-        "y": 141.573974609375,\r
+        "x": 2955.490966796875,\r
+        "y": 179.573974609375,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "d0806055.3ff898"\r
+                "b85ff289.1649f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0806055.3ff898",\r
+        "id": "b85ff289.1649f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3112.0625,\r
-        "y": 141.8597412109375,\r
+        "x": 3133.0625,\r
+        "y": 179.8597412109375,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4943cdeb.ab6f2c",\r
+        "id": "a6d32e01.02e81",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2930,\r
-        "y": 191,\r
+        "x": 2951,\r
+        "y": 229,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "e3a044a2.8747b8"\r
+                "381f7f5a.80d3f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a044a2.8747b8",\r
+        "id": "381f7f5a.80d3f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3112,\r
-        "y": 191,\r
+        "x": 3133,\r
+        "y": 229,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adfd76db.6991",\r
+        "id": "8ea1434f.746858",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2934,\r
-        "y": 242,\r
+        "x": 2955,\r
+        "y": 280,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b8ee302f.a8ecc"\r
+                "6ca45b0b.848dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8ee302f.a8ecc",\r
+        "id": "6ca45b0b.848dec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3114,\r
-        "y": 242,\r
+        "x": 3135,\r
+        "y": 280,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "3637c149.a4c596"\r
+                "14b8fde.fcc1702"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c0e5ba2.cb2954",\r
+        "id": "40603cb7.607bc4",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2605,\r
-        "y": 466,\r
+        "x": 2626,\r
+        "y": 504,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "acd1414b.a58ab8"\r
+                "4e667cbe.69222c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acd1414b.a58ab8",\r
+        "id": "4e667cbe.69222c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2885,\r
-        "y": 466,\r
+        "x": 2906,\r
+        "y": 504,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4b086b8f.46122c"\r
+                "e1ac55d9.d865b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff4803af.9f0ab8",\r
+        "id": "13452ae4.22e4ad",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3090,\r
-        "y": 440,\r
+        "x": 3111,\r
+        "y": 478,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ae60df75.bd38f"\r
+                "245f45af.4ae9da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae60df75.bd38f",\r
+        "id": "245f45af.4ae9da",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3266.9998779296875,\r
-        "y": 432.9998779296875,\r
+        "x": 3287.9998779296875,\r
+        "y": 470.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "7c4264ea.4ef2cc",\r
-                "16bdb614.ef254a"\r
+                "868607a4.e796b",\r
+                "3bdb9c7c.d6977c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c4264ea.4ef2cc",\r
+        "id": "868607a4.e796b",\r
         "type": "set",\r
         "name": "set the 1st network-policy-id",\r
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 3509.9998779296875,\r
-        "y": 389.9998779296875,\r
+        "x": 3530.9998779296875,\r
+        "y": 427.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16bdb614.ef254a",\r
+        "id": "3bdb9c7c.d6977c",\r
         "type": "save",\r
         "name": "get network-policy from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3498.9998779296875,\r
-        "y": 444.9998779296875,\r
+        "x": 3519.9998779296875,\r
+        "y": 482.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "589b81b9.57a1a",\r
-                "afdb690e.be2878",\r
-                "2f4f9888.a0047"\r
+                "11d90691.38b7b1",\r
+                "e5aaddec.aca59",\r
+                "6698da7a.77b3bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f4f9888.a0047",\r
+        "id": "6698da7a.77b3bc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3752,\r
-        "y": 331,\r
+        "x": 3773,\r
+        "y": 369,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "10811a3b.3713ee"\r
+                "e904e6fc.1061a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10811a3b.3713ee",\r
+        "id": "e904e6fc.1061a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3900.571533203125,\r
-        "y": 331.2857666015625,\r
+        "x": 3921.571533203125,\r
+        "y": 369.2857666015625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4b0529d.fb0728",\r
+        "id": "4975bc8f.93ecdc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3899.509033203125,\r
-        "y": 375.426025390625,\r
+        "x": 3920.509033203125,\r
+        "y": 413.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "afdb690e.be2878",\r
+        "id": "e5aaddec.aca59",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3740.509033203125,\r
-        "y": 375.426025390625,\r
+        "x": 3761.509033203125,\r
+        "y": 413.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a4b0529d.fb0728"\r
+                "4975bc8f.93ecdc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "589b81b9.57a1a",\r
+        "id": "11d90691.38b7b1",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3747.509033203125,\r
-        "y": 454.426025390625,\r
+        "x": 3768.509033203125,\r
+        "y": 492.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2140264c.6d5f92"\r
+                "3b14af19.ae1128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2140264c.6d5f92",\r
+        "id": "3b14af19.ae1128",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3886.509033203125,\r
-        "y": 454.426025390625,\r
+        "x": 3907.509033203125,\r
+        "y": 492.426025390625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "22cd0794.035c48",\r
-                "fae49c49.31b99"\r
+                "70ed97b5.dc1c9",\r
+                "c2e43483.a12bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22cd0794.035c48",\r
+        "id": "70ed97b5.dc1c9",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 4092,\r
-        "y": 452,\r
+        "x": 4113,\r
+        "y": 490,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2546bd9f.525272",\r
+        "id": "c9fe9947.c06348",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2948,\r
-        "y": 633,\r
+        "x": 2969,\r
+        "y": 671,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "536f807c.cf39f",\r
-                "47e593b9.b45a3c"\r
+                "78baed3e.c501f4",\r
+                "120f1ac.ca76ae5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47e593b9.b45a3c",\r
+        "id": "120f1ac.ca76ae5",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3171,\r
-        "y": 619,\r
+        "x": 3192,\r
+        "y": 657,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "97a737cb.3ff9d8"\r
+                "40ab4c81.445cd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "536f807c.cf39f",\r
+        "id": "78baed3e.c501f4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3173,\r
-        "y": 652,\r
+        "x": 3194,\r
+        "y": 690,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2752a0c2.80dc4"\r
+                "9d068c67.4598d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2752a0c2.80dc4",\r
+        "id": "9d068c67.4598d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 3316,\r
-        "y": 649,\r
+        "x": 3337,\r
+        "y": 687,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97a737cb.3ff9d8",\r
+        "id": "40ab4c81.445cd4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3319,\r
-        "y": 612,\r
+        "x": 3340,\r
+        "y": 650,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "50707e3e.984ff",\r
-                "fca22b88.65f128"\r
+                "e718de2c.ab002",\r
+                "68fbd6c1.ad0448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50707e3e.984ff",\r
+        "id": "e718de2c.ab002",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3481,\r
-        "y": 607,\r
+        "x": 3502,\r
+        "y": 645,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94119745.c4be9",\r
+        "id": "669a0eda.d8f578",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2962,\r
-        "y": 1469.9998779296875,\r
+        "x": 2983,\r
+        "y": 1507.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "754647f7.9e2b8",\r
-                "657955bd.91fb44"\r
+                "3eeffc60.cab244",\r
+                "163d6add.444455"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "657955bd.91fb44",\r
+        "id": "163d6add.444455",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3185,\r
-        "y": 1455.9998779296875,\r
+        "x": 3206,\r
+        "y": 1493.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "80a7821a.19495"\r
+                "2e1531f5.2b244e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754647f7.9e2b8",\r
+        "id": "3eeffc60.cab244",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3187,\r
-        "y": 1488.9998779296875,\r
+        "x": 3208,\r
+        "y": 1526.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ee8e0ea1.9fea78"\r
+                "bb0d91d9.020e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee8e0ea1.9fea78",\r
+        "id": "bb0d91d9.020e4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 3330,\r
-        "y": 1485.9998779296875,\r
+        "x": 3351,\r
+        "y": 1523.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80a7821a.19495",\r
+        "id": "2e1531f5.2b244e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3333,\r
-        "y": 1448.9998779296875,\r
+        "x": 3354,\r
+        "y": 1486.9998779296875,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "413b415f.4e9208",\r
-                "81398c99.8688f"\r
+                "dd9519ef.d4213",\r
+                "54817df4.67d484"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "413b415f.4e9208",\r
+        "id": "dd9519ef.d4213",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3527,\r
-        "y": 1452,\r
+        "x": 3548,\r
+        "y": 1490,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f5068f1.5086e8",\r
+        "id": "ac58016f.1c2c1",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1073,\r
-        "y": 178,\r
+        "x": 1094,\r
+        "y": 216,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f17f018.71ce48",\r
+        "id": "260f00b5.585908",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding domainA",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2424,\r
-        "y": 2090,\r
+        "x": 2445,\r
+        "y": 2128,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75da5f28.16fb78",\r
+        "id": "134248ca.e0fa77",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding domainB",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2422,\r
-        "y": 2378,\r
+        "x": 2443,\r
+        "y": 2416,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b5222c9.d7a36c",\r
+        "id": "c830d981.aee038",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3595,\r
-        "y": 1203,\r
+        "x": 3616,\r
+        "y": 1241,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "57baeaf4.ebf064"\r
+                "4f78d00a.39ba68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57baeaf4.ebf064",\r
+        "id": "4f78d00a.39ba68",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3801,\r
-        "y": 1203,\r
+        "x": 3822,\r
+        "y": 1241,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "645e8c5e.f65a7c"\r
+                "489cbbcb.77186c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "645e8c5e.f65a7c",\r
+        "id": "489cbbcb.77186c",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4016.28564453125,\r
-        "y": 1202.82177734375,\r
+        "x": 4037.28564453125,\r
+        "y": 1240.82177734375,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "894c9d7e.ee38"\r
+                "3bbad5a.8ec85aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "894c9d7e.ee38",\r
+        "id": "3bbad5a.8ec85aa",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4223.1171875,\r
-        "y": 1203.34033203125,\r
+        "x": 4244.1171875,\r
+        "y": 1241.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "d6f40c53.9a6bf",\r
-                "c910efe.c0a679",\r
-                "50a2016f.cc5d58"\r
+                "cf0eeee3.8d6188",\r
+                "80da6c7c.bf9bc",\r
+                "4327bba4.ea16c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6f40c53.9a6bf",\r
+        "id": "cf0eeee3.8d6188",\r
         "type": "set",\r
         "name": "set source ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4438.1171875,\r
-        "y": 1165.34033203125,\r
+        "x": 4459.1171875,\r
+        "y": 1203.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c910efe.c0a679",\r
+        "id": "80da6c7c.bf9bc",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4435.1171875,\r
-        "y": 1204.34033203125,\r
+        "x": 4456.1171875,\r
+        "y": 1242.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ab61e075.552a9"\r
+                "54d57ef.0aa16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50a2016f.cc5d58",\r
+        "id": "4327bba4.ea16c4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4390.6171875,\r
-        "y": 1246.34033203125,\r
+        "x": 4411.6171875,\r
+        "y": 1284.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab61e075.552a9",\r
+        "id": "54d57ef.0aa16",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4615.6171875,\r
-        "y": 1203.34033203125,\r
+        "x": 4636.6171875,\r
+        "y": 1241.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "11eef788.e7252"\r
+                "136083ca.f8ed24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11eef788.e7252",\r
+        "id": "136083ca.f8ed24",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4773.6171875,\r
-        "y": 1203.34033203125,\r
+        "x": 4794.6171875,\r
+        "y": 1241.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ab0df37c.a4d9e"\r
+                "43a5fa3.d0c2504"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab0df37c.a4d9e",\r
+        "id": "43a5fa3.d0c2504",\r
         "type": "set",\r
         "name": "set source tunnel tp ip",\r
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 4980.6171875,\r
-        "y": 1203.34033203125,\r
+        "x": 5001.6171875,\r
+        "y": 1241.34033203125,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3da30ce3.e252e4",\r
+        "id": "d281a70f.336618",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3592,\r
-        "y": 2072.0001220703125,\r
+        "x": 3613,\r
+        "y": 2110.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "5324422e.146a4c"\r
+                "21553f06.14bad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5324422e.146a4c",\r
+        "id": "21553f06.14bad",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3798,\r
-        "y": 2072.0001220703125,\r
+        "x": 3819,\r
+        "y": 2110.0001220703125,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "a66bf5f9.332a38"\r
+                "d5a45fe2.8cbaf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a66bf5f9.332a38",\r
+        "id": "d5a45fe2.8cbaf",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4013.28564453125,\r
-        "y": 2071.8218994140625,\r
+        "x": 4034.28564453125,\r
+        "y": 2109.8218994140625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "68fca589.e390fc"\r
+                "3432450f.73fd1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68fca589.e390fc",\r
+        "id": "3432450f.73fd1a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4220.1171875,\r
-        "y": 2072.3404541015625,\r
+        "x": 4241.1171875,\r
+        "y": 2110.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "c073bf38.974dd",\r
-                "108cc1af.4a86d6",\r
-                "f0b0cdee.26542"\r
+                "4d1b045c.8befb4",\r
+                "ff4bcdcd.b592",\r
+                "82369db7.8fbd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c073bf38.974dd",\r
+        "id": "4d1b045c.8befb4",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4435.1171875,\r
-        "y": 2034.3404541015625,\r
+        "x": 4456.1171875,\r
+        "y": 2072.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "108cc1af.4a86d6",\r
+        "id": "ff4bcdcd.b592",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4432.1171875,\r
-        "y": 2073.3404541015625,\r
+        "x": 4453.1171875,\r
+        "y": 2111.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b43fbaf.be38548"\r
+                "a8f23d1f.d221e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0b0cdee.26542",\r
+        "id": "82369db7.8fbd4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4387.6171875,\r
-        "y": 2115.3404541015625,\r
+        "x": 4408.6171875,\r
+        "y": 2153.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b43fbaf.be38548",\r
+        "id": "a8f23d1f.d221e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4612.6171875,\r
-        "y": 2072.3404541015625,\r
+        "x": 4633.6171875,\r
+        "y": 2110.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f843935.e7b9ef"\r
+                "403d184.8f53468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f843935.e7b9ef",\r
+        "id": "403d184.8f53468",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4770.6171875,\r
-        "y": 2072.3404541015625,\r
+        "x": 4791.6171875,\r
+        "y": 2110.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2905073f.78af38"\r
+                "c7d0f697.2aea68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2905073f.78af38",\r
+        "id": "c7d0f697.2aea68",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 4977.6171875,\r
-        "y": 2072.3404541015625,\r
+        "x": 4998.6171875,\r
+        "y": 2110.3404541015625,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47a3a765.16faa",\r
+        "id": "84749d0f.3038c8",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\n<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 2353,\r
-        "y": 2999,\r
+        "x": 2374,\r
+        "y": 3037,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fca22b88.65f128",\r
+        "id": "68fbd6c1.ad0448",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3508,\r
-        "y": 679,\r
+        "x": 3529,\r
+        "y": 717,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "26e1e178.44c626",\r
-                "748c5faa.9b8fd",\r
-                "7a23584.42cb7a8"\r
+                "69417d44.afb3fc",\r
+                "a15ac77e.798db8",\r
+                "3a89038d.704134"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26e1e178.44c626",\r
+        "id": "69417d44.afb3fc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3703.5001220703125,\r
-        "y": 631,\r
+        "x": 3724.5001220703125,\r
+        "y": 669,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4f3cfb5.bd9ae04"\r
+                "138b37c3.968d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "748c5faa.9b8fd",\r
+        "id": "a15ac77e.798db8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3695.5001220703125,\r
-        "y": 686,\r
+        "x": 3716.5001220703125,\r
+        "y": 724,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "7374c1c1.b3ba38"\r
+                "5742f10e.dadab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a23584.42cb7a8",\r
+        "id": "3a89038d.704134",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3700.5001220703125,\r
-        "y": 743,\r
+        "x": 3721.5001220703125,\r
+        "y": 781,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "bf06b166.7b1ab8"\r
+                "56dfcb3e.f8e3ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf06b166.7b1ab8",\r
+        "id": "56dfcb3e.f8e3ac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3852.5001220703125,\r
-        "y": 744,\r
+        "x": 3873.5001220703125,\r
+        "y": 782,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7374c1c1.b3ba38",\r
+        "id": "5742f10e.dadab8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3863.5001220703125,\r
-        "y": 689,\r
+        "x": 3884.5001220703125,\r
+        "y": 727,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f3cfb5.bd9ae04",\r
+        "id": "138b37c3.968d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3847.8824462890625,\r
-        "y": 628.6556701660156,\r
+        "x": 3868.8824462890625,\r
+        "y": 666.6556701660156,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "cc5e035f.d2ea7"\r
+                "b4d80ee.d93167"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71b56e6f.bcf72",\r
+        "id": "40dc3d01.0cfddc",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4430,\r
-        "y": 647,\r
+        "x": 4451,\r
+        "y": 685,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "894c8dc1.732e8"\r
+                "ce5ec787.25a25"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "894c8dc1.732e8",\r
+        "id": "ce5ec787.25a25",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4607,\r
-        "y": 639,\r
+        "x": 4628,\r
+        "y": 677,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "47f97449.7cbbcc",\r
-                "7c6d32ec.4900b4"\r
+                "deda36.39eb45c8",\r
+                "2c916faf.da498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc5e035f.d2ea7",\r
+        "id": "b4d80ee.d93167",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4032,\r
-        "y": 643,\r
+        "x": 4053,\r
+        "y": 681,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "611703bb.9151dc"\r
+                "83a731e6.aee9d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "611703bb.9151dc",\r
+        "id": "83a731e6.aee9d8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4227,\r
-        "y": 643,\r
+        "x": 4248,\r
+        "y": 681,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "71b56e6f.bcf72",\r
-                "bf1946eb.ee80a8"\r
+                "40dc3d01.0cfddc",\r
+                "556c2535.2cf6f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47f97449.7cbbcc",\r
+        "id": "deda36.39eb45c8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
-        "x": 4845,\r
-        "y": 594,\r
+        "x": 4866,\r
+        "y": 632,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f99473bc.f6917",\r
+        "id": "883ac008.74f89",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5025,\r
-        "y": 637,\r
+        "x": 5046,\r
+        "y": 675,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "701e34ee.427b2c"\r
+                "5bb6445.b0cb1bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ca213cb.13c578",\r
+        "id": "6cf958ca.c3e4a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5017,\r
-        "y": 692,\r
+        "x": 5038,\r
+        "y": 730,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2e4b614b.0c396e"\r
+                "f6420bc8.c6108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73897c92.dacd5c",\r
+        "id": "e70b241a.97d7e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5022,\r
-        "y": 749,\r
+        "x": 5043,\r
+        "y": 787,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ce57e89b.dcf4b"\r
+                "e90b6e53.2dc61"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce57e89b.dcf4b",\r
+        "id": "e90b6e53.2dc61",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5174,\r
-        "y": 750,\r
+        "x": 5195,\r
+        "y": 788,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e4b614b.0c396e",\r
+        "id": "f6420bc8.c6108",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5185,\r
-        "y": 695,\r
+        "x": 5206,\r
+        "y": 733,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "701e34ee.427b2c",\r
+        "id": "5bb6445.b0cb1bc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5169.38232421875,\r
-        "y": 634.6556701660156,\r
+        "x": 5190.38232421875,\r
+        "y": 672.6556701660156,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "986be552.d67d4"\r
+                "36dcfa67.508606"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "986be552.d67d4",\r
+        "id": "36dcfa67.508606",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
-        "x": 5384,\r
-        "y": 631,\r
+        "x": 5405,\r
+        "y": 669,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81398c99.8688f",\r
+        "id": "54817df4.67d484",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3549,\r
-        "y": 1520,\r
+        "x": 3570,\r
+        "y": 1558,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "4228d77e.297a48",\r
-                "f33d7dd3.e27df8",\r
-                "f25d8688.bde06"\r
+                "12332a8b.1f458d",\r
+                "e70d4463.7fed78",\r
+                "9e28dd86.32b368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4228d77e.297a48",\r
+        "id": "12332a8b.1f458d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3744.5001220703125,\r
-        "y": 1472,\r
+        "x": 3765.5001220703125,\r
+        "y": 1510,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b81f1049.782548"\r
+                "97851436.c0f798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f33d7dd3.e27df8",\r
+        "id": "e70d4463.7fed78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3736.5001220703125,\r
-        "y": 1527,\r
+        "x": 3757.5001220703125,\r
+        "y": 1565,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "cb4038b7.689b5"\r
+                "9865196d.c10828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f25d8688.bde06",\r
+        "id": "9e28dd86.32b368",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3741.5001220703125,\r
-        "y": 1584,\r
+        "x": 3762.5001220703125,\r
+        "y": 1622,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "9d53815.71bad"\r
+                "1636bf8.c7b9e41"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d53815.71bad",\r
+        "id": "1636bf8.c7b9e41",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3893.5001220703125,\r
-        "y": 1585,\r
+        "x": 3914.5001220703125,\r
+        "y": 1623,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb4038b7.689b5",\r
+        "id": "9865196d.c10828",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3904.5001220703125,\r
-        "y": 1530,\r
+        "x": 3925.5001220703125,\r
+        "y": 1568,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b81f1049.782548",\r
+        "id": "97851436.c0f798",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3888.8824462890625,\r
-        "y": 1469.6556701660156,\r
+        "x": 3909.8824462890625,\r
+        "y": 1507.6556701660156,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "3a1b087b.88796"\r
+                "601870d2.2269c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9eaf216b.504558",\r
+        "id": "358b8a93.9adabe",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4471,\r
-        "y": 1488,\r
+        "x": 4492,\r
+        "y": 1526,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "848ce8ba.8131a8"\r
+                "f1454db6.8dcaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "848ce8ba.8131a8",\r
+        "id": "f1454db6.8dcaf8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4648,\r
-        "y": 1480,\r
+        "x": 4669,\r
+        "y": 1518,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "91abee3d.323e5",\r
-                "a28d627d.aad29"\r
+                "1806e2c2.14485d",\r
+                "8cb20d6f.760bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a1b087b.88796",\r
+        "id": "601870d2.2269c8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4073,\r
-        "y": 1484,\r
+        "x": 4094,\r
+        "y": 1522,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "75ba425.30354bc"\r
+                "4732f224.c95254"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75ba425.30354bc",\r
+        "id": "4732f224.c95254",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4268,\r
-        "y": 1484,\r
+        "x": 4289,\r
+        "y": 1522,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "9eaf216b.504558",\r
-                "f41408f6.625698"\r
+                "358b8a93.9adabe",\r
+                "3beefc43.434434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a28d627d.aad29",\r
+        "id": "8cb20d6f.760bf",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4856,\r
-        "y": 1487,\r
+        "x": 4877,\r
+        "y": 1525,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "2c1c230e.a8a514",\r
-                "77340ca1.3f4454",\r
-                "b69cbef8.164728"\r
+                "c4071110.82806",\r
+                "ce108d7.ad4977",\r
+                "c040099f.13bbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91abee3d.323e5",\r
+        "id": "1806e2c2.14485d",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
-        "x": 4886,\r
-        "y": 1435,\r
+        "x": 4907,\r
+        "y": 1473,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c1c230e.a8a514",\r
+        "id": "c4071110.82806",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5066,\r
-        "y": 1478,\r
+        "x": 5087,\r
+        "y": 1516,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ea8a7330.3c6eb"\r
+                "c3f3513e.3d36c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77340ca1.3f4454",\r
+        "id": "ce108d7.ad4977",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5058,\r
-        "y": 1533,\r
+        "x": 5079,\r
+        "y": 1571,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "5b6119be.e0e2e"\r
+                "98979539.818688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b69cbef8.164728",\r
+        "id": "c040099f.13bbf8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5063,\r
-        "y": 1590,\r
+        "x": 5084,\r
+        "y": 1628,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "6e980a04.e6ca2c"\r
+                "45d3d695.c0cf2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e980a04.e6ca2c",\r
+        "id": "45d3d695.c0cf2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5215,\r
-        "y": 1591,\r
+        "x": 5236,\r
+        "y": 1629,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b6119be.e0e2e",\r
+        "id": "98979539.818688",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5226,\r
-        "y": 1536,\r
+        "x": 5247,\r
+        "y": 1574,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea8a7330.3c6eb",\r
+        "id": "c3f3513e.3d36c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5210.38232421875,\r
-        "y": 1475.6556701660156,\r
+        "x": 5231.38232421875,\r
+        "y": 1513.6556701660156,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "6b04dce3.953014"\r
+                "90464df.06ab9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b04dce3.953014",\r
+        "id": "90464df.06ab9b",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
-        "x": 5425,\r
-        "y": 1472,\r
+        "x": 5446,\r
+        "y": 1510,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8335f76.9af8388",\r
+        "id": "a5814717.4b953",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode slice creation domainA",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2404,\r
-        "y": 2682,\r
+        "x": 2425,\r
+        "y": 2720,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f515c1e9.93c64",\r
-                "49a0370a.e5f21"\r
+                "2242c3cc.13b1dc",\r
+                "2c8586d6.b70122"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49a0370a.e5f21",\r
+        "id": "2c8586d6.b70122",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2670,\r
-        "y": 2662,\r
+        "x": 2691,\r
+        "y": 2700,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "30dceb43.a4b4ac"\r
+                "8e14b997.54e1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f515c1e9.93c64",\r
+        "id": "2242c3cc.13b1dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2671.000213623047,\r
-        "y": 2712.99990940094,\r
+        "x": 2692.000213623047,\r
+        "y": 2750.99990940094,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "e7a629da.88d0d8"\r
+                "72bda37b.1b4f84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30dceb43.a4b4ac",\r
+        "id": "8e14b997.54e1b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",\r
         "comments": "",\r
-        "x": 2810.0002479553223,\r
-        "y": 2662.0000009536743,\r
+        "x": 2831.0002479553223,\r
+        "y": 2700.0000009536743,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7a629da.88d0d8",\r
+        "id": "72bda37b.1b4f84",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2816.02725982666,\r
-        "y": 2710.745394706726,\r
+        "x": 2837.02725982666,\r
+        "y": 2748.745394706726,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5651ec55.50184c",\r
+        "id": "39b144a2.fc3a7c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode slice creation domainB",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2404,\r
-        "y": 3054,\r
+        "x": 2425,\r
+        "y": 3092,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "55b8a548.7743b4",\r
-                "625f938a.695c34"\r
+                "23f4f16e.f2ab6e",\r
+                "8c667512.e5492"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "625f938a.695c34",\r
+        "id": "8c667512.e5492",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2670,\r
-        "y": 3034,\r
+        "x": 2691,\r
+        "y": 3072,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "bcc07e6e.d74a18"\r
+                "1089012f.df48c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55b8a548.7743b4",\r
+        "id": "23f4f16e.f2ab6e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2671.000213623047,\r
-        "y": 3084.99990940094,\r
+        "x": 2692.000213623047,\r
+        "y": 3122.99990940094,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "42c61fdb.9a2b6"\r
+                "199cfc4b.ed097c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcc07e6e.d74a18",\r
+        "id": "1089012f.df48c7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain B\" />\n",\r
         "comments": "",\r
-        "x": 2810.0002479553223,\r
-        "y": 3034.0000009536743,\r
+        "x": 2831.0002479553223,\r
+        "y": 3072.0000009536743,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "42c61fdb.9a2b6",\r
+        "id": "199cfc4b.ed097c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2816.02725982666,\r
-        "y": 3082.745394706726,\r
+        "x": 2837.02725982666,\r
+        "y": 3120.745394706726,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ccfe530c.696ee",\r
+        "id": "c14b8719.903d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2509,\r
-        "y": 412,\r
+        "x": 2530,\r
+        "y": 450,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "7c0e5ba2.cb2954",\r
-                "338a39d3.a481ce"\r
+                "40603cb7.607bc4",\r
+                "7f3f76ad.e04ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "338a39d3.a481ce",\r
+        "id": "7f3f76ad.e04ac8",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2790,\r
-        "y": 368,\r
+        "x": 2811,\r
+        "y": 406,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "e9d2da22.090e3"\r
+                "31eeaed6.c9c2d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9d2da22.090e3",\r
+        "id": "31eeaed6.c9c2d2",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3052,\r
-        "y": 368,\r
+        "x": 3073,\r
+        "y": 406,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "ff4803af.9f0ab8"\r
+                "13452ae4.22e4ad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf1946eb.ee80a8",\r
+        "id": "556c2535.2cf6f4",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4433,\r
-        "y": 721,\r
+        "x": 4454,\r
+        "y": 759,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "c3550750.f869a"\r
+                "8b677154.0c28b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3550750.f869a",\r
+        "id": "8b677154.0c28b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4610,\r
-        "y": 713,\r
+        "x": 4631,\r
+        "y": 751,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "775fd622.bb73b"\r
+                "dbe05c47.574588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "775fd622.bb73b",\r
+        "id": "dbe05c47.574588",\r
         "type": "set",\r
         "name": "set domainA ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4845,\r
-        "y": 837,\r
+        "x": 4866,\r
+        "y": 875,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd89b518.9f0b6",\r
+        "id": "e5346606.e9d9f",\r
         "type": "set",\r
         "name": "set domainB ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4885,\r
-        "y": 1677,\r
+        "x": 4906,\r
+        "y": 1715,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73a6ccfa.9f80e4",\r
+        "id": "279e5fe1.a8b868",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4650,\r
-        "y": 1553,\r
+        "x": 4671,\r
+        "y": 1591,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "fd89b518.9f0b6"\r
+                "e5346606.e9d9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f41408f6.625698",\r
+        "id": "3beefc43.434434",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4473,\r
-        "y": 1561,\r
+        "x": 4494,\r
+        "y": 1599,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "73a6ccfa.9f80e4"\r
+                "279e5fe1.a8b868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edb297b0.c9f328",\r
+        "id": "21292318.735edc",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domainA UNI Coloring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2406,\r
-        "y": 2815,\r
+        "x": 2427,\r
+        "y": 2853,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "cc44d1ea.6c2858",\r
-                "700c6956.d8abf8"\r
+                "aa98c0a5.978718",\r
+                "47316c0a.b315dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "700c6956.d8abf8",\r
+        "id": "47316c0a.b315dc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2672,\r
-        "y": 2795,\r
+        "x": 2693,\r
+        "y": 2833,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "b7581f37.075ad"\r
+                "a7504bbe.eb60e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc44d1ea.6c2858",\r
+        "id": "aa98c0a5.978718",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2673.000213623047,\r
-        "y": 2845.99990940094,\r
+        "x": 2694.000213623047,\r
+        "y": 2883.99990940094,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f67d237f.4b41c"\r
+                "98c604c1.7b11b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7581f37.075ad",\r
+        "id": "a7504bbe.eb60e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",\r
         "comments": "",\r
-        "x": 2812.0002479553223,\r
-        "y": 2795.0000009536743,\r
+        "x": 2833.0002479553223,\r
+        "y": 2833.0000009536743,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f67d237f.4b41c",\r
+        "id": "98c604c1.7b11b8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2818.02725982666,\r
-        "y": 2843.745394706726,\r
+        "x": 2839.02725982666,\r
+        "y": 2881.745394706726,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "91eba2f3.844de",\r
+        "id": "ce066c5d.e7734",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domainB UNI Coloring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2406,\r
-        "y": 3181,\r
+        "x": 2427,\r
+        "y": 3219,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "cf85f70c.9ad7a",\r
-                "da777837.c4e49"\r
+                "77909c9d.223f24",\r
+                "d69f9ea8.7be4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da777837.c4e49",\r
+        "id": "d69f9ea8.7be4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2672,\r
-        "y": 3161,\r
+        "x": 2693,\r
+        "y": 3199,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "382ee7c9.8791c8"\r
+                "f7f9f969.a37708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf85f70c.9ad7a",\r
+        "id": "77909c9d.223f24",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2673.000213623047,\r
-        "y": 3211.99990940094,\r
+        "x": 2694.000213623047,\r
+        "y": 3249.99990940094,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             [\r
-                "f2adb059.12803"\r
+                "cf24be41.03bc48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "382ee7c9.8791c8",\r
+        "id": "f7f9f969.a37708",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",\r
         "comments": "",\r
-        "x": 2812.0002479553223,\r
-        "y": 3161.0000009536743,\r
+        "x": 2833.0002479553223,\r
+        "y": 3199.0000009536743,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2adb059.12803",\r
+        "id": "cf24be41.03bc48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2818.02725982666,\r
-        "y": 3209.745394706726,\r
+        "x": 2839.02725982666,\r
+        "y": 3247.745394706726,\r
         "z": "4d37a11.42c136",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fae49c49.31b99",\r
+        "id": "c2e43483.a12bd",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 4091,\r
-        "y": 498,\r
+        "x": 4112,\r
+        "y": 536,\r
         "z": "4d37a11.42c136",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "303c5717.c426f",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for ethernet-service-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2468,\r
+        "y": 730,\r
+        "z": "4d37a11.42c136",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c19c2198.0de5c",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for otn-tunnel-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2448,\r
+        "y": 770,\r
+        "z": "4d37a11.42c136",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index bb6d1ae..b94ac02 100644 (file)
                                                                                     </outcome>\r
                                                                                 </execute>\r
                                                                                 <set>\r
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\r
+                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\r
+                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\r
+                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\r
                                                                                     <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\r
                                                                                     <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\r
                                                                                     <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\r
                                                                                     <parameter name='index-number' value='0' />\r
                                                                                     <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\r
                                                                                     <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\r
+                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
+                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
                                                                                 </set>\r
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r
                                                                                             </outcome>\r
                                                                                         </execute>\r
                                                                                         <set>\r
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\r
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\r
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\r
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\r
                                                                                             <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\r
                                                                                             <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\r
                                                                                             <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\r
                                                                                             <parameter name='index-number' value='0' />\r
                                                                                             <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\r
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\r
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
                                                                                         </set>\r
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r
index 0231223..ff23866 100644 (file)
                                                                                         </outcome>\r
                                                                                         <outcome value='success'>\r
                                                                                             <block>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>\r
+                                                                                                </execute>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>\r
+                                                                                                </execute>\r
                                                                                                 <set>\r
                                                                                                     <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />\r
                                                                                                 </set>\r
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\r
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\r
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-A.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-A.client-id`' />\r
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-B.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-B.client-id`' />\r
index 50a82fb..5842e0b 100644 (file)
@@ -3,6 +3,7 @@
         "etht-svc-instances":[
             {
                 "etht-svc-name": ${eth-service-name},
+                "ietf-optical-slice:slice-id": ${slice-id},
                 "etht-svc-descr": "Ethernet-over-OTN",
                 "etht-svc-type": "ietf-eth-tran-types:p2p-svc",
                 "te-topology-identifier":{
@@ -42,8 +43,8 @@
                         "service-classification-type":"ietf-eth-tran-types:vlan-classification",
                         "ingress-egress-bandwidth-profile":{
                             "bandwidth-profile-type":"ietf-eth-tran-types:mef-10-bwp",
-                            "CIR":5000,
-                            "EIR":5000
+                            "CIR": ${CIR},
+                            "EIR":${EIR}
                         }
                     }
                 ]