Supporting 3 or more network domains for Transport Slicing use case.
authorHesam Rahimi <hesam.rahimi@huawei.com>
Mon, 22 Feb 2021 15:30:38 +0000 (15:30 +0000)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Mon, 22 Feb 2021 15:35:10 +0000 (15:35 +0000)
Issue-ID: SDNC-1487

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ia497741d70eff0f5fba12ad487f0f240709b5cb5

15 files changed:
installation/src/main/properties/generic-resource-api-dg.properties
platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
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/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
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/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceG-list.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json [new file with mode: 0644]

index d412713..5d4654a 100644 (file)
@@ -38,8 +38,10 @@ restapi.oof-getpath.templatefile=oof-getpath.json
 restapi.transport-slice-creation.templatefile=ts-allocate-tn-slice.json
 restapi.transport-sliceA-list-creation.templatefile=ts-allocate-tn-sliceA-list.json
 restapi.transport-sliceB-list-creation.templatefile=ts-allocate-tn-sliceB-list.json
+restapi.transport-sliceG-list-creation.templatefile=ts-allocate-tn-sliceG-list.json
 restapi.ts-otn-src-domain-creation.templatefile=ts-otn-tunnel-src-domain.json
 restapi.ts-otn-dst-domain-creation.templatefile=ts-otn-tunnel-dst-domain.json
+restapi.ts-otn-domainG-creation.templatefile=ts-otn-tunnel-domainG.json
 restapi.ts-ethernet-service.templatefile=ts-ethernet-service.json
 restapi.ts-coloring-uni-port.templatefile=ts-coloring-uni-port.json
 restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json
index ead08f4..862817a 100644 (file)
 [\r
     {\r
-        "id": "3872acaa.809c44",\r
+        "id": "e773e89.91c6b98",\r
         "type": "other",\r
         "name": "update",\r
         "xml": "<outcome value='Update'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 710,\r
-        "y": 305,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 716,\r
+        "y": 331,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "5a988226.7d9fdc"\r
+                "e959cc87.47852"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbb694.b27a417",\r
+        "id": "c1b624e8.c4a36",\r
         "type": "other",\r
         "name": "delete",\r
         "xml": "<outcome value='Delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 710,\r
-        "y": 385,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 716,\r
+        "y": 411,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "754f4acc.eae6dc"\r
+                "f94d770b.d7a21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754f4acc.eae6dc",\r
+        "id": "f94d770b.d7a21",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 851.5,\r
-        "y": 385,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 857.5,\r
+        "y": 411,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "983792ba.976408"\r
+                "4f7d3c56.d58604"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cc508ad.f5c7d",\r
+        "id": "a0413cd2.f1f8e8",\r
         "type": "switchNode",\r
         "name": "switch aai-event-trigger",\r
         "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 540.5,\r
-        "y": 345,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 546.5,\r
+        "y": 371,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "3872acaa.809c44",\r
-                "dbb694.b27a417"\r
+                "e773e89.91c6b98",\r
+                "c1b624e8.c4a36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f974c517.d68cd",\r
+        "id": "24096151.ae8cf6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1237.5,\r
-        "y": 216,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1243.5,\r
+        "y": 242,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "29d0fcfc.c3657c",\r
-                "80deb47b.7e9e",\r
-                "f9b155cc.d14098",\r
-                "c374fd8f.2c9bc8",\r
-                "31237f4.62f8c"\r
+                "d3849c0c.290268",\r
+                "2e3a9914.38f54e",\r
+                "5d9111f6.fc1a7",\r
+                "e1aa7ec9.6ea95",\r
+                "4884da36.8dcb24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80deb47b.7e9e",\r
+        "id": "2e3a9914.38f54e",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1510.5001983642578,\r
-        "y": 137.00000953674316,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1516.5001983642578,\r
+        "y": 163.00000953674316,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "6d5b07.e87e6cf8",\r
-                "403286df.c4eed8"\r
+                "e0b90864.1c659",\r
+                "2d5ac090.7f4d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d5b07.e87e6cf8",\r
+        "id": "e0b90864.1c659",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1800.000244140625,\r
-        "y": 129,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1806.000244140625,\r
+        "y": 155,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "b95a0f0f.c5f4"\r
+                "fbadc5f1.b9042"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "403286df.c4eed8",\r
+        "id": "2d5ac090.7f4d28",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1796.000244140625,\r
-        "y": 169,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1802.000244140625,\r
+        "y": 195,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "f35984bc.58f298"\r
+                "8ebd62d2.d420b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b95a0f0f.c5f4",\r
+        "id": "fbadc5f1.b9042",\r
         "type": "set",\r
         "name": "set token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",\r
         "comments": "",\r
-        "x": 1950.500244140625,\r
-        "y": 129,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1956.500244140625,\r
+        "y": 155,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c03c3a2.5764a48",\r
+        "id": "74d21b60.35097c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get Topology",\r
         "xml": "<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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2017.500244140625,\r
-        "y": 249,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2023.500244140625,\r
+        "y": 275,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "986cb045.40c5",\r
-                "e9ec571f.c3cfe8"\r
+                "73b2188f.535b88",\r
+                "e3942d82.1d981"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "986cb045.40c5",\r
+        "id": "73b2188f.535b88",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2260.000244140625,\r
-        "y": 269,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2266.000244140625,\r
+        "y": 295,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "7a144ec7.8a9348"\r
+                "4a760f4a.5cb7e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a144ec7.8a9348",\r
+        "id": "4a760f4a.5cb7e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2417.500244140625,\r
-        "y": 269,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2423.500244140625,\r
+        "y": 295,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "55ea6ad.8497214",\r
-                "ad96f3f.ca0439"\r
+                "300a5bac.b9481c",\r
+                "ad97aa98.c768d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2f07a72.d9a858",\r
+        "id": "8f9fe5f7.1e28d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "x": 2394.000244140625,\r
-        "y": 169,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2400.000244140625,\r
+        "y": 195,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9ec571f.c3cfe8",\r
+        "id": "e3942d82.1d981",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2256.000244140625,\r
-        "y": 169,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2262.000244140625,\r
+        "y": 195,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "c2f07a72.d9a858"\r
+                "8f9fe5f7.1e28d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d5868e5.98eab",\r
+        "id": "52ac41c0.5bfd18",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 163,\r
-        "y": 80,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 169,\r
+        "y": 106,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "22d8189e.4866f"\r
+                "2f07965a.1dd8e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22d8189e.4866f",\r
+        "id": "2f07965a.1dd8e2",\r
         "type": "service-logic",\r
         "name": "DataChange ${project.version}",\r
         "module": "DataChange",\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='DataChange' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 176,\r
-        "y": 140,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 182,\r
+        "y": 166,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "3a8b8af3.4d4416"\r
+                "be9d83e5.bff8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a8b8af3.4d4416",\r
+        "id": "be9d83e5.bff8b",\r
         "type": "method",\r
         "name": "method esr-thirdparty-sdnc-discovery",\r
         "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 196,\r
-        "y": 220,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 202,\r
+        "y": 246,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "c8a85a4d.9e66f"\r
+                "dc3c6fc7.178d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8a85a4d.9e66f",\r
+        "id": "dc3c6fc7.178d18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 443.5,\r
-        "y": 220,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 449.5,\r
+        "y": 246,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "cbd24389.ade708"\r
+                "febec156.8b3598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55ea6ad.8497214",\r
+        "id": "300a5bac.b9481c",\r
         "type": "for",\r
         "name": "for each Network",\r
         "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2636.500244140625,\r
-        "y": 198,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2642.500244140625,\r
+        "y": 224,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "1ed2d22d.82cc36"\r
+                "2eec7c8a.0065d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ed2d22d.82cc36",\r
+        "id": "2eec7c8a.0065d4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2785.000244140625,\r
-        "y": 198,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2791.000244140625,\r
+        "y": 224,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "852144d1.2cc6d",\r
-                "530a9a06.d69fc4"\r
+                "c6d65b06.9b8418",\r
+                "d5bb0470.a0963",\r
+                "51f49074.c67e58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "852144d1.2cc6d",\r
+        "id": "c6d65b06.9b8418",\r
         "type": "call",\r
         "name": "call update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2964.000244140625,\r
-        "y": 218,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2970.000244140625,\r
+        "y": 244,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "530a9a06.d69fc4",\r
+        "id": "d5bb0470.a0963",\r
         "type": "set",\r
         "name": "set network",\r
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",\r
         "comments": "",\r
-        "x": 2919.000244140625,\r
-        "y": 178,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2923.000244140625,\r
+        "y": 204,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f35984bc.58f298",\r
+        "id": "8ebd62d2.d420b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1916.000244140625,\r
-        "y": 169,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1922.000244140625,\r
+        "y": 195,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a473b7cc.4471d8",\r
+        "id": "e262d253.cb79",\r
         "type": "comment",\r
         "name": "Do Nothing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2086.000244140625,\r
-        "y": 209,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2092.000244140625,\r
+        "y": 235,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9afda1.5ca9828",\r
+        "id": "a6bffc76.37edc",\r
         "type": "switchNode",\r
         "name": "switch type",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963,\r
-        "y": 305,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 969,\r
+        "y": 331,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "7ea96e84.4a184",\r
-                "e5a11dd.415fde",\r
-                "11ea46b7.9ad609",\r
-                "a5c3b391.3c4aa"\r
+                "6f99e35d.de977c",\r
+                "c02a6e99.4562c",\r
+                "3d7935ef.04d57a",\r
+                "cfd2103d.fd26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a988226.7d9fdc",\r
+        "id": "e959cc87.47852",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 830,\r
-        "y": 305,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 836,\r
+        "y": 331,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d9afda1.5ca9828"\r
+                "a6bffc76.37edc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ea96e84.4a184",\r
+        "id": "6f99e35d.de977c",\r
         "type": "other",\r
         "name": "SOTN",\r
         "xml": "<outcome value='SOTN'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1076,\r
-        "y": 216,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1082,\r
+        "y": 242,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "f974c517.d68cd"\r
+                "24096151.ae8cf6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5a11dd.415fde",\r
+        "id": "c02a6e99.4562c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1105.5,\r
-        "y": 677.5001220703125,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1111.5,\r
+        "y": 703.5001220703125,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "4a0581b6.8cbdf"\r
+                "1f5381b5.13672e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a0581b6.8cbdf",\r
+        "id": "1f5381b5.13672e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",\r
         "comments": "",\r
-        "x": 1291.75,\r
-        "y": 703.5001220703125,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1297.75,\r
+        "y": 729.5001220703125,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29d0fcfc.c3657c",\r
+        "id": "d3849c0c.290268",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1457.0001983642578,\r
-        "y": 97.00000953674316,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1463.0001983642578,\r
+        "y": 123.00000953674316,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f9b155cc.d14098",\r
+        "id": "5d9111f6.fc1a7",\r
         "type": "switchNode",\r
         "name": "switch prop.sdncRestApi.token_id",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1503.5001983642578,\r
-        "y": 217.00000953674316,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1509.5001983642578,\r
+        "y": 243.00000953674316,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "4e229170.2e1108",\r
-                "495c5d16.740274"\r
+                "8bff0ee3.9c1d08",\r
+                "46defe8b.c98d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e229170.2e1108",\r
+        "id": "8bff0ee3.9c1d08",\r
         "type": "other",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1796.000244140625,\r
-        "y": 209,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1802.000244140625,\r
+        "y": 235,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "b14dd129.fcf7f"\r
+                "4af5b25c.a6728c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "495c5d16.740274",\r
+        "id": "46defe8b.c98d58",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1796.000244140625,\r
-        "y": 249,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1802.000244140625,\r
+        "y": 275,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "c03c3a2.5764a48"\r
+                "74d21b60.35097c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b14dd129.fcf7f",\r
+        "id": "4af5b25c.a6728c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Get Topology",\r
         "xml": "<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
         "outputs": 1,\r
-        "x": 2017.500244140625,\r
-        "y": 209,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2023.500244140625,\r
+        "y": 235,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "e9ec571f.c3cfe8",\r
-                "986cb045.40c5"\r
+                "e3942d82.1d981",\r
+                "73b2188f.535b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31237f4.62f8c",\r
+        "id": "4884da36.8dcb24",\r
         "type": "execute",\r
         "name": "execute RestconfDiscoveryNode",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1500.0001983642578,\r
-        "y": 357.00000953674316,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1506.0001983642578,\r
+        "y": 383.00000953674316,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c374fd8f.2c9bc8",\r
+        "id": "e1aa7ec9.6ea95",\r
         "type": "set",\r
         "name": "set encoding-format",\r
         "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />",\r
         "comments": "",\r
-        "x": 1460.0001983642578,\r
-        "y": 317.00000953674316,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1466.0001983642578,\r
+        "y": 343.00000953674316,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47fcc4e5.c080a4",\r
+        "id": "bbab4551.0a236",\r
         "type": "comment",\r
         "name": "Notification subscription",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1465.000343322754,\r
-        "y": 274.00000858306885,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1471.000343322754,\r
+        "y": 300.00000858306885,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbd24389.ade708",\r
+        "id": "febec156.8b3598",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 150,\r
-        "y": 345,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 156,\r
+        "y": 371,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "f624fdf6.4a4ef8",\r
-                "67364ea6.885738"\r
+                "9a519619.b1895",\r
+                "48ffb5b3.b827e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f624fdf6.4a4ef8",\r
+        "id": "9a519619.b1895",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 337,\r
-        "y": 345,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 343,\r
+        "y": 371,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "4cc508ad.f5c7d"\r
+                "a0413cd2.f1f8e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67364ea6.885738",\r
+        "id": "48ffb5b3.b827e4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 111.00003051757812,\r
-        "y": 1101.75,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 117.00003051757812,\r
+        "y": 1127.75,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "48c54790.7a017"\r
+                "9ffa3ea5.b70bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48c54790.7a017",\r
+        "id": "9ffa3ea5.b70bf",\r
         "type": "call",\r
         "name": "call esr-thirdparty-sdnc-of-zte",\r
         "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 342.75,\r
-        "y": 1118.5000610351562,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 348.75,\r
+        "y": 1144.5000610351562,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "11ea46b7.9ad609",\r
+        "id": "3d7935ef.04d57a",\r
         "type": "other",\r
         "name": "TAPI",\r
         "xml": "<outcome value='TAPI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1154,\r
-        "y": 450,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1160,\r
+        "y": 476,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "a1313060.f8d7d"\r
+                "4fe6a7b1.5767f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1313060.f8d7d",\r
+        "id": "4fe6a7b1.5767f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1317,\r
-        "y": 449,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1323,\r
+        "y": 475,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "f271610b.da5a3"\r
+                "f9123ca9.fc888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f271610b.da5a3",\r
+        "id": "f9123ca9.fc888",\r
         "type": "execute",\r
         "name": "execute",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`\"/>  \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=\"topologies\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1478,\r
-        "y": 448,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1484,\r
+        "y": 474,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "878204ba.609a58",\r
-                "1c89864.e323d7a"\r
+                "cc52ed00.f5d2c",\r
+                "dd1ac4e1.b59088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c89864.e323d7a",\r
+        "id": "dd1ac4e1.b59088",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1620,\r
-        "y": 524,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1626,\r
+        "y": 550,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "5d965dcc.6101a4"\r
+                "f1e8f88.8710a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "878204ba.609a58",\r
+        "id": "cc52ed00.f5d2c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1654,\r
-        "y": 445,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1660,\r
+        "y": 471,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "4052d329.1b779c"\r
+                "54fdb7ce.6dd1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4052d329.1b779c",\r
+        "id": "54fdb7ce.6dd1a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get topology TAPI rest api\" />\n\n",\r
         "comments": "",\r
-        "x": 1824,\r
-        "y": 444,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1830,\r
+        "y": 470,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d965dcc.6101a4",\r
+        "id": "f1e8f88.8710a88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1781,\r
-        "y": 523,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1787,\r
+        "y": 549,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d1531df6.3732f"\r
+                "f8f968a.7a53a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1531df6.3732f",\r
+        "id": "f8f968a.7a53a98",\r
         "type": "for",\r
         "name": "for each topology",\r
         "xml": "<for index='tidx' start='0' end=\"`$topologies.topology_length`\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1960,\r
-        "y": 523,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1966,\r
+        "y": 549,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "8b55167c.96333"\r
+                "3fb827df.939078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b55167c.96333",\r
+        "id": "3fb827df.939078",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2127,\r
-        "y": 524,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2133,\r
+        "y": 550,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "e7e4969d.73ce58",\r
-                "9e2e1ddf.baa2b"\r
+                "6c8666ff.44e6e8",\r
+                "8622f8e6.4ca888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7e4969d.73ce58",\r
+        "id": "6c8666ff.44e6e8",\r
         "type": "set",\r
         "name": "set topology",\r
         "xml": "<set>\n<parameter name='topology.' value='`$topologies.topology[$tidx].`' />\n",\r
         "comments": "",\r
-        "x": 2286,\r
-        "y": 525,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2292,\r
+        "y": 551,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e2e1ddf.baa2b",\r
+        "id": "8622f8e6.4ca888",\r
         "type": "call",\r
         "name": "call tapi-update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2277,\r
-        "y": 591,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2283,\r
+        "y": 617,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a5c3b391.3c4aa",\r
+        "id": "cfd2103d.fd26",\r
         "type": "outcome",\r
         "name": "MSA",\r
         "xml": "<outcome value='MSA'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1124.677324295044,\r
-        "y": 606.8993349075317,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1130.677324295044,\r
+        "y": 632.8993349075317,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "1925d7f4.b889a8"\r
+                "787c580c.21a83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1925d7f4.b889a8",\r
+        "id": "787c580c.21a83",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1286.6773872375488,\r
-        "y": 604.899335861206,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1292.6773872375488,\r
+        "y": 630.899335861206,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "7ba5724d.ffaffc"\r
+                "cb55af39.dad0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ba5724d.ffaffc",\r
+        "id": "cb55af39.dad0b",\r
         "type": "execute",\r
         "name": "execute",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`\"/>  \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=\"networks\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.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": 1463.6771354675293,\r
-        "y": 596.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1469.6771354675293,\r
+        "y": 622.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "6946de0a.deebc",\r
-                "5d4a6514.4c3a9c"\r
+                "55b8f3fc.f2c404",\r
+                "dba7d725.59fa18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6946de0a.deebc",\r
+        "id": "55b8f3fc.f2c404",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1616.6771354675293,\r
-        "y": 593.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1622.6771354675293,\r
+        "y": 619.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "e290e7ee.1a21f"\r
+                "2cc6fdd5.2640a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e290e7ee.1a21f",\r
+        "id": "2cc6fdd5.2640a2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get topology MSA rest api\" />\n\n",\r
         "comments": "",\r
-        "x": 1791.6771354675293,\r
-        "y": 592.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1797.6771354675293,\r
+        "y": 618.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d4a6514.4c3a9c",\r
+        "id": "dba7d725.59fa18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1622.6771354675293,\r
-        "y": 666.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1628.6771354675293,\r
+        "y": 692.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "815556fb.bd9668"\r
+                "170b822d.317ece"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "815556fb.bd9668",\r
+        "id": "170b822d.317ece",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1806.6771354675293,\r
-        "y": 668.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1812.6771354675293,\r
+        "y": 694.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "9834a552.e8e02"\r
+                "8f4caf49.c88e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9834a552.e8e02",\r
+        "id": "8f4caf49.c88e68",\r
         "type": "call",\r
         "name": "call msa-update-network-to-aai",\r
         "xml": "<call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2085.677001953125,\r
-        "y": 666.8992919921875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2091.677001953125,\r
+        "y": 692.8992919921875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "983792ba.976408",\r
+        "id": "4f7d3c56.d58604",\r
         "type": "switchNode",\r
         "name": "switch type",\r
         "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 256.566650390625,\r
-        "y": 835.5666809082031,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 262.566650390625,\r
+        "y": 861.5666809082031,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "674a6a9f.8c143c",\r
-                "42c7b2ab.76125c",\r
-                "1501fed.f113881"\r
+                "7c479945.15b6c",\r
+                "41dab8d.79e9dc8",\r
+                "fb32359d.de7e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "674a6a9f.8c143c",\r
+        "id": "7c479945.15b6c",\r
         "type": "outcome",\r
         "name": "MSA",\r
         "xml": "<outcome value='MSA'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 435.857177734375,\r
-        "y": 752.9285888671875,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 441.857177734375,\r
+        "y": 778.9285888671875,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "8b3cf345.6948d"\r
+                "d9d0d78b.47d9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42c7b2ab.76125c",\r
+        "id": "41dab8d.79e9dc8",\r
         "type": "other",\r
         "name": "TAPI",\r
         "xml": "<outcome value='TAPI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 444.6070556640625,\r
-        "y": 1003.6428527832031,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 450.6070556640625,\r
+        "y": 1029.6428527832031,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "ec6a41aa.381fd"\r
+                "1a2de346.3f0ebd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b3cf345.6948d",\r
+        "id": "d9d0d78b.47d9f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.607177734375,\r
-        "y": 749.7143249511719,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 595.607177734375,\r
+        "y": 775.7143249511719,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "49d8550e.67af3c",\r
-                "db848d25.52ee9"\r
+                "e787c325.7a3d48",\r
+                "e74f02d1.684a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec6a41aa.381fd",\r
+        "id": "1a2de346.3f0ebd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594,\r
-        "y": 1003.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 600,\r
+        "y": 1029.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "1335976f.2d9b19",\r
-                "16c45478.af99e4"\r
+                "39caa350.271204",\r
+                "14436f1d.f47b89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1501fed.f113881",\r
+        "id": "fb32359d.de7e3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 547,\r
-        "y": 1167.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 553,\r
+        "y": 1193.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "41c63854.9379a8"\r
+                "33b66d76.b73a6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41c63854.9379a8",\r
+        "id": "33b66d76.b73a6a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",\r
         "comments": "",\r
-        "x": 709,\r
-        "y": 1206.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 715,\r
+        "y": 1232.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49d8550e.67af3c",\r
+        "id": "e787c325.7a3d48",\r
         "type": "get-resource",\r
         "name": "get resources from DB -controller_id",\r
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 821.5,\r
-        "y": 797.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 827.5,\r
+        "y": 823.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "1a8d1895.ab6a47",\r
-                "47ef9d8f.3964f4",\r
-                "d98324ce.97ca8"\r
+                "48ef075d.23d478",\r
+                "6aefa7bc.0e864",\r
+                "b6643c83.4fa068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db848d25.52ee9",\r
+        "id": "e74f02d1.684a5",\r
         "type": "set",\r
         "name": "set controller_id",\r
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",\r
         "comments": "",\r
-        "x": 781.5,\r
-        "y": 731.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 787.5,\r
+        "y": 757.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a8d1895.ab6a47",\r
+        "id": "48ef075d.23d478",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1060.5,\r
-        "y": 817.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1066.5,\r
+        "y": 843.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d1f9e1a7.c7f19"\r
+                "3a0200d5.7fabc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1f9e1a7.c7f19",\r
+        "id": "3a0200d5.7fabc",\r
         "type": "delete",\r
         "name": "delete from db",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1229.5,\r
-        "y": 824.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1235.5,\r
+        "y": 850.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1335976f.2d9b19",\r
+        "id": "39caa350.271204",\r
         "type": "set",\r
         "name": "set controller_id",\r
         "xml": "<set>\n<parameter name='controllerid' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n\n\n",\r
         "comments": "",\r
-        "x": 758.5,\r
-        "y": 959.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 764.5,\r
+        "y": 985.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16c45478.af99e4",\r
+        "id": "14436f1d.f47b89",\r
         "type": "get-resource",\r
         "name": "get resources from DB -controller_id",\r
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE controller_id = $controllerid'\npfx='dbcontrollerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 771.5,\r
-        "y": 1048.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 777.5,\r
+        "y": 1074.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "a8a3e82f.8a5a8",\r
-                "ae0994a7.403ab8",\r
-                "e57ecfd9.55df58"\r
+                "82076a69.af01a",\r
+                "7b1e0312.764db4",\r
+                "5cc08e4.aa9e2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8a3e82f.8a5a8",\r
+        "id": "82076a69.af01a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 996.5,\r
-        "y": 1063.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1002.5,\r
+        "y": 1089.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d7aae079.2ca2a"\r
+                "dc7dee5b.44e56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7aae079.2ca2a",\r
+        "id": "dc7dee5b.44e56",\r
         "type": "delete",\r
         "name": "delete from db",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1167.5,\r
-        "y": 1064.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1173.5,\r
+        "y": 1090.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47ef9d8f.3964f4",\r
+        "id": "6aefa7bc.0e864",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1046.5,\r
-        "y": 896.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1052.5,\r
+        "y": 922.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "1e298c8c.f0408b"\r
+                "2c713fb3.4d6888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae0994a7.403ab8",\r
+        "id": "7b1e0312.764db4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.5,\r
-        "y": 1136.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 983.5,\r
+        "y": 1162.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "c236971a.ee197"\r
+                "2bfd8d24.d64f22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e298c8c.f0408b",\r
+        "id": "2c713fb3.4d6888",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",\r
         "comments": "",\r
-        "x": 1207.5,\r
-        "y": 901.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1213.5,\r
+        "y": 927.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d98324ce.97ca8",\r
+        "id": "b6643c83.4fa068",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1037.5,\r
-        "y": 956.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1043.5,\r
+        "y": 982.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "3416464c.a143ea"\r
+                "a2919cf8.1bf828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3416464c.a143ea",\r
+        "id": "a2919cf8.1bf828",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",\r
         "comments": "",\r
-        "x": 1186.5,\r
-        "y": 958.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1192.5,\r
+        "y": 984.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c236971a.ee197",\r
+        "id": "2bfd8d24.d64f22",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Failure in getting controller-id from DB\" />\n\n",\r
         "comments": "",\r
-        "x": 1125.5,\r
-        "y": 1137.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1131.5,\r
+        "y": 1163.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e57ecfd9.55df58",\r
+        "id": "5cc08e4.aa9e2f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.5,\r
-        "y": 1180.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 983.5,\r
+        "y": 1206.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d5ad8139.acdf48"\r
+                "2f855e70.bc0c7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5ad8139.acdf48",\r
+        "id": "2f855e70.bc0c7a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n <parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"controller-id could not be found in DB\" />\n\n",\r
         "comments": "",\r
-        "x": 1142.5,\r
-        "y": 1177.5,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 1148.5,\r
+        "y": 1203.5,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad96f3f.ca0439",\r
+        "id": "ad97aa98.c768d",\r
         "type": "switchNode",\r
         "name": "switch network_length",\r
         "xml": "<switch test='`$topology.networks.network_length >= 2`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2653,\r
-        "y": 329,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2659,\r
+        "y": 355,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "d135440e.332828"\r
+                "47f11a60.715fe4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d135440e.332828",\r
+        "id": "47f11a60.715fe4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2835,\r
-        "y": 330,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 2841,\r
+        "y": 356,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "9dfbe1b1.0501b8"\r
+                "610c5ba8.ab12f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27de91fe.6ca4f6",\r
+        "id": "3f621874.83f7b",\r
         "type": "for",\r
         "name": "for each Network",\r
         "xml": "<for index='netidx' start='0' end='`$topology.networks.network_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3208,\r
-        "y": 323,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3214,\r
+        "y": 349,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "7ec0ad88.0666cc"\r
+                "47e16032.729b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ec0ad88.0666cc",\r
+        "id": "47e16032.729b78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3426,\r
-        "y": 320,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3432,\r
+        "y": 346,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "8fdc47cc.432ab",\r
-                "b5eed741.5fbb08",\r
-                "1656178e.3ba998"\r
+                "cc7e5bc4.9fb7e8",\r
+                "8fc85a95.09a108",\r
+                "c99c88.f08ccb78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5634a256.4e2744",\r
+        "id": "40eac1bc.82a228",\r
         "type": "call",\r
         "name": "call update-tp-ttp-relationship",\r
         "xml": "<call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3241,\r
-        "y": 383,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3247,\r
+        "y": 409,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9dfbe1b1.0501b8",\r
+        "id": "610c5ba8.ab12f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3005,\r
-        "y": 326,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3011,\r
+        "y": 352,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "27de91fe.6ca4f6",\r
-                "5634a256.4e2744"\r
+                "3f621874.83f7b",\r
+                "40eac1bc.82a228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1656178e.3ba998",\r
+        "id": "c99c88.f08ccb78",\r
         "type": "set",\r
         "name": "unset network",\r
         "xml": "<set>\n<parameter name='network.' value='' />\n",\r
         "comments": "",\r
-        "x": 3585,\r
-        "y": 260,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3591,\r
+        "y": 286,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8fdc47cc.432ab",\r
+        "id": "cc7e5bc4.9fb7e8",\r
         "type": "set",\r
         "name": "set network",\r
         "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$netidx].`' />\n",\r
         "comments": "",\r
-        "x": 3579,\r
-        "y": 308,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3585,\r
+        "y": 334,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b5eed741.5fbb08",\r
+        "id": "8fc85a95.09a108",\r
         "type": "switchNode",\r
         "name": "switch network-types with topologyId",\r
         "xml": "<switch test='`$network.te-topology-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3656,\r
-        "y": 355,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3662,\r
+        "y": 381,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "c1423a29.1c46e8",\r
-                "ab490ddf.8e1c1"\r
+                "a101ef60.461f68",\r
+                "46ddd7fc.c3c038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1423a29.1c46e8",\r
+        "id": "a101ef60.461f68",\r
         "type": "outcome",\r
         "name": "1",\r
         "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3882,\r
-        "y": 324,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3888,\r
+        "y": 350,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "3c6e5d11.fbd2b2"\r
+                "9f9b045e.002478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab490ddf.8e1c1",\r
+        "id": "46ddd7fc.c3c038",\r
         "type": "outcome",\r
         "name": "2",\r
         "xml": "<outcome value='2'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3882,\r
-        "y": 385,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 3888,\r
+        "y": 411,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "654a57a4.0fd38"\r
+                "c00ddb6e.187aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adf965cc.3e515",\r
+        "id": "55fe80ee.35e4c",\r
         "type": "set",\r
         "name": "set network-otn",\r
         "xml": "<set>\n<parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\n",\r
         "comments": "",\r
-        "x": 4177,\r
-        "y": 324,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 4183,\r
+        "y": 350,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1dbbcab.0dda4",\r
+        "id": "b736da6.72f0128",\r
         "type": "set",\r
         "name": "set network eth",\r
         "xml": "<set>\n<parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\n",\r
         "comments": "",\r
-        "x": 4177,\r
-        "y": 385,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 4183,\r
+        "y": 411,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c6e5d11.fbd2b2",\r
+        "id": "9f9b045e.002478",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4016,\r
-        "y": 324,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 4022,\r
+        "y": 350,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "adf965cc.3e515"\r
+                "55fe80ee.35e4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "654a57a4.0fd38",\r
+        "id": "c00ddb6e.187aa",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4017,\r
-        "y": 385,\r
-        "z": "8cb67e95.d771b8",\r
+        "x": 4023,\r
+        "y": 411,\r
+        "z": "8a5117b5.c01db8",\r
         "wires": [\r
             [\r
-                "f1dbbcab.0dda4"\r
+                "b736da6.72f0128"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "51f49074.c67e58",\r
+        "type": "set",\r
+        "name": "unset network",\r
+        "xml": "<set>\n<parameter name='network.' value='' />\n",\r
+        "comments": "",\r
+        "x": 2929,\r
+        "y": 154,\r
+        "z": "8a5117b5.c01db8",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file
index 98585db..05c011b 100644 (file)
@@ -58,6 +58,9 @@
                                                             <block atomic="true">\r
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                     <block>\r
+                                                                        <set>\r
+                                                                            <parameter name='network.' value='' />\r
+                                                                        </set>\r
                                                                         <set>\r
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
                                                             <block atomic="true">\r
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                     <block>\r
+                                                                        <set>\r
+                                                                            <parameter name='network.' value='' />\r
+                                                                        </set>\r
                                                                         <set>\r
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
index 5256b6c..4fe850a 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "abafb433.2b07c",\r
+        "id": "fa52a170.206e7",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 149,\r
-        "y": 95,\r
-        "z": "f861838.07df98",\r
+        "x": 178,\r
+        "y": 101,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "8a2adf01.004b9"\r
+                "2c5db495.a5dd34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a2adf01.004b9",\r
+        "id": "2c5db495.a5dd34",\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": 274,\r
-        "y": 421.00001525878906,\r
-        "z": "f861838.07df98",\r
+        "x": 303,\r
+        "y": 427.00001525878906,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "870eb920.3a709"\r
+                "4ae6db6f.435c7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "870eb920.3a709",\r
+        "id": "4ae6db6f.435c7c",\r
         "type": "method",\r
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 338.0001220703125,\r
-        "y": 514,\r
-        "z": "f861838.07df98",\r
+        "x": 367.0001220703125,\r
+        "y": 520,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "12c71cb4.bbd213"\r
+                "6312c3c3.704cf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b12bbea.4b296c",\r
+        "id": "6bdd3c50.e0d3d4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode getPath from OOF",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.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": 820.9730834960938,\r
-        "y": 172.99600219726562,\r
-        "z": "f861838.07df98",\r
+        "x": 849.9730834960938,\r
+        "y": 178.99600219726562,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "838f6988.2e418",\r
-                "daadcad7.8d5718"\r
+                "7939df96.b1122",\r
+                "945597b.d7df068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "838f6988.2e418",\r
+        "id": "7939df96.b1122",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1060.9732246398926,\r
-        "y": 196.9959716796875,\r
-        "z": "f861838.07df98",\r
+        "x": 1089.9732246398926,\r
+        "y": 202.9959716796875,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e2aa0c83.94cd5"\r
+                "50ded459.a3ce3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cd84c7f.13b994",\r
+        "id": "b5aef0e7.4cc018",\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 OOF api\" />\n",\r
         "comments": "",\r
-        "x": 1199.973258972168,\r
-        "y": 145.99606323242188,\r
-        "z": "f861838.07df98",\r
+        "x": 1259.97314453125,\r
+        "y": 142.99606323242188,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "daadcad7.8d5718",\r
+        "id": "945597b.d7df068",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1059.9730110168457,\r
-        "y": 145.99606227874756,\r
-        "z": "f861838.07df98",\r
+        "x": 1088.9730110168457,\r
+        "y": 151.99606227874756,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "1cd84c7f.13b994"\r
+                "b5aef0e7.4cc018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe1658e6.6b98a8",\r
+        "id": "e01d4a36.839a2",\r
         "type": "comment",\r
         "name": "OTN tunnel path computation",\r
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",\r
         "comments": "",\r
-        "x": 792.4768829345703,\r
-        "y": 129.00000190734863,\r
-        "z": "f861838.07df98",\r
+        "x": 821.4768829345703,\r
+        "y": 135.00000190734863,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6d123ad.aaa61",\r
+        "id": "9cfd026a.5e4728",\r
         "type": "for",\r
         "name": "for vidx..otn-oof.solutions_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 811.972900390625,\r
-        "y": 482.2457275390625,\r
-        "z": "f861838.07df98",\r
+        "x": 840.972900390625,\r
+        "y": 488.2457275390625,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "64a6a0a3.de9e88"\r
+                "8402c7cf.20d6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32873616.6130da",\r
+        "id": "e807132a.83466",\r
         "type": "comment",\r
         "name": "Loop through OTN links",\r
         "info": "",\r
         "comments": "",\r
-        "x": 895.4732055664062,\r
-        "y": 561.74609375,\r
-        "z": "f861838.07df98",\r
+        "x": 924.4732055664062,\r
+        "y": 567.74609375,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64a6a0a3.de9e88",\r
+        "id": "8402c7cf.20d6c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 916.5001220703125,\r
-        "y": 673.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 945.5001220703125,\r
+        "y": 679.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "ebe50f50.427a98",\r
-                "c378542a.988188",\r
-                "b9a4e12.dabba2"\r
+                "5b85782.fa3db08",\r
+                "2d5a2685.b40dfa",\r
+                "20564e8a.e84492"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebe50f50.427a98",\r
+        "id": "5b85782.fa3db08",\r
         "type": "get-resource",\r
         "name": "get-resource cross-link",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1173.5001220703125,\r
-        "y": 663.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1202.5001220703125,\r
+        "y": 669.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "383ad684.d27f02",\r
-                "92e0b7cd.135e8",\r
-                "fc9654b0.26f8f8"\r
+                "d48feed1.3a38",\r
+                "5943270e.4826e8",\r
+                "990db839.99a8f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc9654b0.26f8f8",\r
+        "id": "990db839.99a8f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1375.0001220703125,\r
-        "y": 538.2864685058594,\r
-        "z": "f861838.07df98",\r
+        "x": 1404.0001220703125,\r
+        "y": 544.2864685058594,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a60f2416.5968c8"\r
+                "a9f1b4b6.1c30e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "383ad684.d27f02",\r
+        "id": "d48feed1.3a38",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1411.0001220703125,\r
-        "y": 663.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1440.0001220703125,\r
+        "y": 669.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "1ff2406e.1859a"\r
+                "ac3b3843.658d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92e0b7cd.135e8",\r
+        "id": "5943270e.4826e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1405.0001220703125,\r
-        "y": 713.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1434.0001220703125,\r
+        "y": 719.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a40efbb6.9e2848"\r
+                "da410969.0b2cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ff2406e.1859a",\r
+        "id": "ac3b3843.658d4",\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": 1572.0001220703125,\r
-        "y": 652.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1601.0001220703125,\r
+        "y": 658.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a40efbb6.9e2848",\r
+        "id": "da410969.0b2cc",\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": 1570.0001220703125,\r
-        "y": 708.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1599.0001220703125,\r
+        "y": 714.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4cfcfa39.a67414",\r
+        "id": "d48fe5f1.e695e8",\r
         "type": "comment",\r
         "name": "get cross-domain-link information",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1179.5001220703125,\r
-        "y": 612.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1208.5001220703125,\r
+        "y": 618.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c378542a.988188",\r
+        "id": "2d5a2685.b40dfa",\r
         "type": "set",\r
         "name": "set otn-oof.link-name and etc.",\r
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />",\r
         "comments": "",\r
-        "x": 1163.0001220703125,\r
-        "y": 566.2864990234375,\r
-        "z": "f861838.07df98",\r
+        "x": 1192.0001220703125,\r
+        "y": 572.2864990234375,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e2aa0c83.94cd5",\r
+        "id": "50ded459.a3ce3c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1206.0002708435059,\r
-        "y": 194.74145698547363,\r
-        "z": "f861838.07df98",\r
+        "x": 1235.0002708435059,\r
+        "y": 200.74145698547363,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "12c71cb4.bbd213",\r
+        "id": "6312c3c3.704cf4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 578.9688835144043,\r
-        "y": 440.74163722991943,\r
-        "z": "f861838.07df98",\r
+        "x": 607.9688835144043,\r
+        "y": 446.74163722991943,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "b6d123ad.aaa61",\r
-                "7b12bbea.4b296c"\r
+                "9cfd026a.5e4728",\r
+                "6bdd3c50.e0d3d4",\r
+                "3d2e0b8f.457abc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eed9f90d.625c7",\r
+        "id": "2581c748.7cabd8",\r
         "type": "switchNode",\r
         "name": "test cross-domain-link role",\r
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1690.5001220703125,\r
-        "y": 538,\r
-        "z": "f861838.07df98",\r
+        "x": 1719.5001220703125,\r
+        "y": 544,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "84eec670.e2767"\r
+                "22f3b1f4.9256fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84eec670.e2767",\r
+        "id": "22f3b1f4.9256fe",\r
         "type": "outcome",\r
         "name": "outcome cross-domain",\r
         "xml": "<outcome value='cross-domain'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1926.5001220703125,\r
-        "y": 539,\r
-        "z": "f861838.07df98",\r
+        "x": 1955.5001220703125,\r
+        "y": 545,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "4da26d84.4c4d14"\r
+                "8b1c590c.dc55d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a6d08c1.f63207",\r
+        "id": "a2b70b63.3ba9c8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2245.5,\r
-        "y": 1016,\r
-        "z": "f861838.07df98",\r
+        "x": 2359.4998779296875,\r
+        "y": 1005,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4da26d84.4c4d14",\r
+        "id": "8b1c590c.dc55d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2129.5001220703125,\r
-        "y": 540,\r
-        "z": "f861838.07df98",\r
+        "x": 2158.5001220703125,\r
+        "y": 546,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "1a6d08c1.f63207",\r
-                "1f33bea3.a37e41",\r
-                "a53fb0ab.3215e8",\r
-                "1a72a670.f5c5ba"\r
+                "a2b70b63.3ba9c8",\r
+                "4ab81af3.e377f4",\r
+                "b2e8772a.8ac6e8",\r
+                "a42edec8.e98fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d525a55b.c81c5",\r
+        "id": "3bc9b9f2.81b29e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2570,\r
-        "y": 507,\r
-        "z": "f861838.07df98",\r
+        "x": 2683.9998779296875,\r
+        "y": 496,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "424e6de2.ee50a4"\r
+                "5d4d6dbf.b923ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48c96b61.49802c",\r
+        "id": "37303a4c.954af6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2603.0001220703125,\r
-        "y": 565,\r
-        "z": "f861838.07df98",\r
+        "x": 2717,\r
+        "y": 554,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "90a49841.e9abd"\r
+                "9e71e39b.7fa1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27012bae.421594",\r
+        "id": "fd9ad854.5b33c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2606.0001220703125,\r
-        "y": 617,\r
-        "z": "f861838.07df98",\r
+        "x": 2720,\r
+        "y": 606,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "3218b6b1.58d4da"\r
+                "72bd806e.4e60a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90a49841.e9abd",\r
+        "id": "9e71e39b.7fa1",\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": 2788.0001220703125,\r
-        "y": 569,\r
-        "z": "f861838.07df98",\r
+        "x": 2902,\r
+        "y": 558,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3218b6b1.58d4da",\r
+        "id": "72bd806e.4e60a8",\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": 2776.0001220703125,\r
-        "y": 620,\r
-        "z": "f861838.07df98",\r
+        "x": 2890,\r
+        "y": 609,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "818ff562.39e0e",\r
+        "id": "a1ab74dd.259888",\r
         "type": "set",\r
         "name": "set domain A node ttp-id",\r
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3906.5,\r
-        "y": 422,\r
-        "z": "f861838.07df98",\r
+        "x": 4020.4998779296875,\r
+        "y": 411,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9b5c841.bb08a",\r
+        "id": "78028b3.737cf74",\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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3914.5,\r
-        "y": 474,\r
-        "z": "f861838.07df98",\r
+        "x": 4028.4998779296875,\r
+        "y": 463,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a8ab9ca9.5f37d"\r
+                "f334aa73.fafd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8ab9ca9.5f37d",\r
+        "id": "f334aa73.fafd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4121,\r
-        "y": 452,\r
-        "z": "f861838.07df98",\r
+        "x": 4234.9998779296875,\r
+        "y": 441,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "f4704103.56f298"\r
+                "198591da.45bba6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d07aee9c.38cf",\r
+        "id": "c586fad5.100ad",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3458.66845703125,\r
-        "y": 500.48150634765625,\r
-        "z": "f861838.07df98",\r
+        "x": 3572.6683349609375,\r
+        "y": 489.48150634765625,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "f5a5a2ae.b150d8"\r
+                "8d515769.aa6f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94ee2310.15a178",\r
+        "id": "18757b7c.bab055",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2921.3828125,\r
-        "y": 502.65972900390625,\r
-        "z": "f861838.07df98",\r
+        "x": 3035.3826904296875,\r
+        "y": 491.65972900390625,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "116f7db2.ea55a2"\r
+                "e5aaccbc.1746e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "116f7db2.ea55a2",\r
+        "id": "e5aaccbc.1746e",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3173.3828125,\r
-        "y": 499.65972900390625,\r
-        "z": "f861838.07df98",\r
+        "x": 3287.3826904296875,\r
+        "y": 488.65972900390625,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "d07aee9c.38cf"\r
+                "c586fad5.100ad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5a5a2ae.b150d8",\r
+        "id": "8d515769.aa6f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3685.5,\r
-        "y": 489,\r
-        "z": "f861838.07df98",\r
+        "x": 3799.4998779296875,\r
+        "y": 478,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "818ff562.39e0e",\r
-                "f9b5c841.bb08a",\r
-                "fa235f06.dbc5c8",\r
-                "825f6c70.9f6d6",\r
-                "6fa2423a.fd13dc"\r
+                "a1ab74dd.259888",\r
+                "78028b3.737cf74",\r
+                "e29873e7.48a55",\r
+                "60eed173.f1208",\r
+                "c69a19d0.8fe6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f33bea3.a37e41",\r
+        "id": "4ab81af3.e377f4",\r
         "type": "get-resource",\r
         "name": "get-resource dst tp",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2326.5001220703125,\r
-        "y": 912,\r
-        "z": "f861838.07df98",\r
+        "x": 2440.5,\r
+        "y": 901,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "d37211e1.0a8088",\r
-                "51af98c.c752568",\r
-                "3fe7a459.6ee934"\r
+                "995af278.af1ac8",\r
+                "c9dcb57d.818b28",\r
+                "86496d30.4c8b08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d37211e1.0a8088",\r
+        "id": "995af278.af1ac8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2549,\r
-        "y": 1054,\r
-        "z": "f861838.07df98",\r
+        "x": 2662.9998779296875,\r
+        "y": 1043,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "f87a46b2.f2f308"\r
+                "298c76a3.790b2a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51af98c.c752568",\r
+        "id": "c9dcb57d.818b28",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2533,\r
-        "y": 1105,\r
-        "z": "f861838.07df98",\r
+        "x": 2646.9998779296875,\r
+        "y": 1094,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "87af46d4.1052d"\r
+                "e35f9b5f.fe69c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fe7a459.6ee934",\r
+        "id": "86496d30.4c8b08",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2536,\r
-        "y": 1157,\r
-        "z": "f861838.07df98",\r
+        "x": 2649.9998779296875,\r
+        "y": 1146,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "f5945933.94bc1"\r
+                "fe485369.3b129"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5945933.94bc1",\r
+        "id": "fe485369.3b129",\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": 2706,\r
-        "y": 1160,\r
-        "z": "f861838.07df98",\r
+        "x": 2819.9998779296875,\r
+        "y": 1149,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "87af46d4.1052d",\r
+        "id": "e35f9b5f.fe69c8",\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": 2718,\r
-        "y": 1109,\r
-        "z": "f861838.07df98",\r
+        "x": 2831.9998779296875,\r
+        "y": 1098,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee005d71.029a7",\r
+        "id": "b29ef002.3d9bd8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2905.3828125,\r
-        "y": 1064.6597290039062,\r
-        "z": "f861838.07df98",\r
+        "x": 3019.3826904296875,\r
+        "y": 1053.6597290039062,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "d2d24abe.aac6a"\r
+                "1420228.3521e5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2d24abe.aac6a",\r
+        "id": "1420228.3521e5e",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3148.3828125,\r
-        "y": 1063.6597290039062,\r
-        "z": "f861838.07df98",\r
+        "x": 3262.3826904296875,\r
+        "y": 1052.6597290039062,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "328b374b.e6dea8"\r
+                "5d8a1ce9.20e95c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3d738bb.01d098",\r
+        "id": "50d5c6dd.fd8458",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4914.5,\r
-        "y": 865,\r
-        "z": "f861838.07df98",\r
+        "x": 5028.4998779296875,\r
+        "y": 854,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "d76ed9f4.607e58",\r
-                "4049d8d0.576ec8",\r
-                "6d1ae1e8.8376b8"\r
+                "6e9eddf0.722754",\r
+                "4df00122.6ae7d8",\r
+                "5c18dd82.55be5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "328b374b.e6dea8",\r
+        "id": "5d8a1ce9.20e95c",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3404.66845703125,\r
-        "y": 1063.4815063476562,\r
-        "z": "f861838.07df98",\r
+        "x": 3518.6683349609375,\r
+        "y": 1052.4815063476562,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "daeaf8a3.f790f8"\r
+                "431b8e7f.397f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b11078d7.b3b858",\r
+        "id": "5d78c070.cc21d",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4701.5,\r
-        "y": 864,\r
-        "z": "f861838.07df98",\r
+        "x": 4815.4998779296875,\r
+        "y": 853,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a3d738bb.01d098"\r
+                "50d5c6dd.fd8458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daeaf8a3.f790f8",\r
+        "id": "431b8e7f.397f08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3704.5,\r
-        "y": 1061,\r
-        "z": "f861838.07df98",\r
+        "x": 3818.4998779296875,\r
+        "y": 1050,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "590b13b.935b9ec",\r
-                "b7482d1e.97b0b8",\r
-                "4d91a36f.ea12e4",\r
-                "32404ee3.71aeda",\r
-                "88a4d7d3.2c52b"\r
+                "9fe095e8.34fca",\r
+                "9f30760a.8f0188",\r
+                "3e68bf5c.62e23",\r
+                "16edc927.badbff",\r
+                "c1a0d70e.9bb548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "590b13b.935b9ec",\r
+        "id": "9fe095e8.34fca",\r
         "type": "set",\r
         "name": "set domain B node ttp-id",\r
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3946.5,\r
-        "y": 1015,\r
-        "z": "f861838.07df98",\r
+        "x": 4060.4998779296875,\r
+        "y": 1004,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7482d1e.97b0b8",\r
+        "id": "9f30760a.8f0188",\r
         "type": "get-resource",\r
         "name": "get-resource dst 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.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3936.5,\r
-        "y": 1066,\r
-        "z": "f861838.07df98",\r
+        "x": 4050.4998779296875,\r
+        "y": 1055,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "3475127.fd4c36e"\r
+                "f0dbdf9f.2f9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3475127.fd4c36e",\r
+        "id": "f0dbdf9f.2f9a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4124,\r
-        "y": 1064,\r
-        "z": "f861838.07df98",\r
+        "x": 4237.9998779296875,\r
+        "y": 1053,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "8e8366a6.32694"\r
+                "aaf730ad.ded658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d76ed9f4.607e58",\r
+        "id": "6e9eddf0.722754",\r
         "type": "set",\r
         "name": "set domain B network-id",\r
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 5184.5,\r
-        "y": 841,\r
-        "z": "f861838.07df98",\r
+        "x": 5298.4998779296875,\r
+        "y": 830,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4049d8d0.576ec8",\r
+        "id": "4df00122.6ae7d8",\r
         "type": "get-resource",\r
         "name": "get-resource dst network-resource",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5194.5,\r
-        "y": 887,\r
-        "z": "f861838.07df98",\r
+        "x": 5308.4998779296875,\r
+        "y": 876,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e9f242cc.c24dd8"\r
+                "6bfb2c0.fcf9cd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9f242cc.c24dd8",\r
+        "id": "6bfb2c0.fcf9cd4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5410,\r
-        "y": 878,\r
-        "z": "f861838.07df98",\r
+        "x": 5523.9998779296875,\r
+        "y": 867,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "43e26006.8bc19"\r
+                "46a8e7db.6247c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43e26006.8bc19",\r
+        "id": "46a8e7db.6247c8",\r
         "type": "set",\r
         "name": "set domain B network-id, topo-id, client-id, etc",\r
-        "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n",\r
+        "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",\r
         "comments": "",\r
-        "x": 5664.5,\r
-        "y": 884,\r
-        "z": "f861838.07df98",\r
+        "x": 5778.4998779296875,\r
+        "y": 873,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "424e6de2.ee50a4",\r
+        "id": "5d4d6dbf.b923ac",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2704,\r
-        "y": 503,\r
-        "z": "f861838.07df98",\r
+        "x": 2817.9998779296875,\r
+        "y": 492,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "94ee2310.15a178"\r
+                "18757b7c.bab055"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f87a46b2.f2f308",\r
+        "id": "298c76a3.790b2a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2695,\r
-        "y": 1045,\r
-        "z": "f861838.07df98",\r
+        "x": 2808.9998779296875,\r
+        "y": 1034,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "ee005d71.029a7"\r
+                "b29ef002.3d9bd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a60f2416.5968c8",\r
+        "id": "a9f1b4b6.1c30e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1509,\r
-        "y": 540,\r
-        "z": "f861838.07df98",\r
+        "x": 1538,\r
+        "y": 546,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "eed9f90d.625c7"\r
+                "2581c748.7cabd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a53fb0ab.3215e8",\r
+        "id": "b2e8772a.8ac6e8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2279,\r
-        "y": 324,\r
-        "z": "f861838.07df98",\r
+        "x": 2392.9998779296875,\r
+        "y": 313,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "128e534.d6bf2ad"\r
+                "3399a4f5.011714"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "128e534.d6bf2ad",\r
+        "id": "3399a4f5.011714",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2478,\r
-        "y": 321,\r
-        "z": "f861838.07df98",\r
+        "x": 2591.9998779296875,\r
+        "y": 310,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "11b1dca5.336a6b"\r
+                "d2b9c322.61b4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11b1dca5.336a6b",\r
+        "id": "d2b9c322.61b4e",\r
         "type": "outcome",\r
         "name": "p-interface",\r
         "xml": "<outcome value='p-interface'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2655.117431640625,\r
-        "y": 319.34027099609375,\r
-        "z": "f861838.07df98",\r
+        "x": 2769.1173095703125,\r
+        "y": 308.34027099609375,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "16999964.0052a7"\r
+                "daf680e0.e985f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9fc0be8.cb4e7",\r
+        "id": "614113e.09a2a6c",\r
         "type": "set",\r
         "name": "set src-ltpId",\r
-        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->\n",\r
         "comments": "",\r
-        "x": 3507,\r
-        "y": 233,\r
-        "z": "f861838.07df98",\r
+        "x": 3620.9998779296875,\r
+        "y": 222,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bbad66bd.203d28",\r
+        "id": "c1945a01.da39d8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3492,\r
-        "y": 281,\r
-        "z": "f861838.07df98",\r
+        "x": 3605.9998779296875,\r
+        "y": 270,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16999964.0052a7",\r
+        "id": "daf680e0.e985f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2795,\r
-        "y": 304,\r
-        "z": "f861838.07df98",\r
+        "x": 2908.9998779296875,\r
+        "y": 293,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "c4129dee.e1028",\r
-                "4b41d356.da9dfc"\r
+                "56dc1543.ce88ec",\r
+                "b07af7fc.6b63b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4704103.56f298",\r
+        "id": "198591da.45bba6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4296,\r
-        "y": 448,\r
-        "z": "f861838.07df98",\r
+        "x": 4409.9998779296875,\r
+        "y": 437,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "9beffd2c.502c6"\r
+                "c08fd8d6.2bd66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e8366a6.32694",\r
+        "id": "aaf730ad.ded658",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4313,\r
-        "y": 1053,\r
-        "z": "f861838.07df98",\r
+        "x": 4426.9998779296875,\r
+        "y": 1042,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "2782166b.894a72"\r
+                "64775e7a.bf3908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a72a670.f5c5ba",\r
+        "id": "a42edec8.e98fb",\r
         "type": "get-resource",\r
         "name": "get-resource src tp",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2372.5001220703125,\r
-        "y": 546,\r
-        "z": "f861838.07df98",\r
+        "x": 2486.5,\r
+        "y": 535,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "d525a55b.c81c5",\r
-                "48c96b61.49802c",\r
-                "27012bae.421594"\r
+                "3bc9b9f2.81b29e",\r
+                "37303a4c.954af6",\r
+                "fd9ad854.5b33c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa235f06.dbc5c8",\r
+        "id": "e29873e7.48a55",\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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3776,\r
-        "y": 292,\r
-        "z": "f861838.07df98",\r
+        "x": 3889.9998779296875,\r
+        "y": 281,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "97e1c7ea.89c31",\r
-                "a32ada2.7e46ba8",\r
-                "6c014e40.0055a8"\r
+                "98eef2c3.4b1e6",\r
+                "b3fdc3b3.daa6d",\r
+                "bb3698f8.9dc54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97e1c7ea.89c31",\r
+        "id": "98eef2c3.4b1e6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3971.5001220703125,\r
-        "y": 244,\r
-        "z": "f861838.07df98",\r
+        "x": 4085.5,\r
+        "y": 233,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "76aa8066.8a0a68"\r
+                "1e54913c.73cd4f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32ada2.7e46ba8",\r
+        "id": "b3fdc3b3.daa6d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3963.5001220703125,\r
-        "y": 299,\r
-        "z": "f861838.07df98",\r
+        "x": 4077.5,\r
+        "y": 288,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e78aff2c.f74de8"\r
+                "8746e11a.2a66c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c014e40.0055a8",\r
+        "id": "bb3698f8.9dc54",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3968.5001220703125,\r
-        "y": 356,\r
-        "z": "f861838.07df98",\r
+        "x": 4082.5,\r
+        "y": 345,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "72ca8bf8.aa197c"\r
+                "be336b5b.cedab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72ca8bf8.aa197c",\r
+        "id": "be336b5b.cedab8",\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": 4120.5001220703125,\r
-        "y": 357,\r
-        "z": "f861838.07df98",\r
+        "x": 4234.5,\r
+        "y": 346,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e78aff2c.f74de8",\r
+        "id": "8746e11a.2a66c",\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": 4131.5001220703125,\r
-        "y": 302,\r
-        "z": "f861838.07df98",\r
+        "x": 4245.5,\r
+        "y": 291,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76aa8066.8a0a68",\r
+        "id": "1e54913c.73cd4f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4115.8824462890625,\r
-        "y": 241.65567016601562,\r
-        "z": "f861838.07df98",\r
+        "x": 4229.88232421875,\r
+        "y": 230.65567016601562,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "2bdb018d.2fcdb6",\r
-                "d5b2333f.df7ba8"\r
+                "e08a0980.5d50e",\r
+                "8e112ac6.c7732"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bdb018d.2fcdb6",\r
+        "id": "e08a0980.5d50e",\r
         "type": "set",\r
         "name": "set domain A node-id and tpn",\r
-        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n",\r
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",\r
         "comments": "",\r
-        "x": 4341,\r
-        "y": 197,\r
-        "z": "f861838.07df98",\r
+        "x": 4454.9998779296875,\r
+        "y": 186,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "825f6c70.9f6d6",\r
+        "id": "60eed173.f1208",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3863,\r
-        "y": 539,\r
-        "z": "f861838.07df98",\r
+        "x": 3976.9998779296875,\r
+        "y": 528,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9beffd2c.502c6",\r
+        "id": "c08fd8d6.2bd66",\r
         "type": "set",\r
         "name": "set domain A tunnel tp ip",\r
-        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4557,\r
-        "y": 445,\r
-        "z": "f861838.07df98",\r
+        "x": 4670.9998779296875,\r
+        "y": 434,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32404ee3.71aeda",\r
+        "id": "16edc927.badbff",\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-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3773,\r
-        "y": 895,\r
-        "z": "f861838.07df98",\r
+        "x": 3886.9998779296875,\r
+        "y": 884,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "38443514.32f97a",\r
-                "3f48494d.b1e386",\r
-                "1d72a1d4.29172e"\r
+                "123bf516.85c49b",\r
+                "6c28943b.60b994",\r
+                "19639884.e536cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d72a1d4.29172e",\r
+        "id": "19639884.e536cf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3968.5001220703125,\r
-        "y": 847,\r
-        "z": "f861838.07df98",\r
+        "x": 4082.5,\r
+        "y": 836,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e3710364.81565"\r
+                "c2d1aecb.85e098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f48494d.b1e386",\r
+        "id": "6c28943b.60b994",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3960.5001220703125,\r
-        "y": 902,\r
-        "z": "f861838.07df98",\r
+        "x": 4074.5,\r
+        "y": 891,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "1d46287c.a3abe"\r
+                "1ac89a13.d0df06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38443514.32f97a",\r
+        "id": "123bf516.85c49b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3965.5001220703125,\r
-        "y": 959,\r
-        "z": "f861838.07df98",\r
+        "x": 4079.5,\r
+        "y": 948,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "cdfeb34e.901888"\r
+                "b06bf8cb.62556"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3710364.81565",\r
+        "id": "c2d1aecb.85e098",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4112.8824462890625,\r
-        "y": 844.6556701660156,\r
-        "z": "f861838.07df98",\r
+        "x": 4226.88232421875,\r
+        "y": 833.6556701660156,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "f36692a0.716e88",\r
-                "2c5d340f.626864"\r
+                "a9a60061.b99928",\r
+                "cfa839ce.804738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d46287c.a3abe",\r
+        "id": "1ac89a13.d0df06",\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": 4128.5001220703125,\r
-        "y": 905,\r
-        "z": "f861838.07df98",\r
+        "x": 4242.5,\r
+        "y": 894,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cdfeb34e.901888",\r
+        "id": "b06bf8cb.62556",\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": 4117.5001220703125,\r
-        "y": 960,\r
-        "z": "f861838.07df98",\r
+        "x": 4231.5,\r
+        "y": 949,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f36692a0.716e88",\r
+        "id": "a9a60061.b99928",\r
         "type": "set",\r
         "name": "set domain B node-id and tpn",\r
-        "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n",\r
+        "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",\r
         "comments": "",\r
-        "x": 4322,\r
-        "y": 812,\r
-        "z": "f861838.07df98",\r
+        "x": 4435.9998779296875,\r
+        "y": 801,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d91a36f.ea12e4",\r
+        "id": "3e68bf5c.62e23",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3892,\r
-        "y": 1107,\r
-        "z": "f861838.07df98",\r
+        "x": 4005.9998779296875,\r
+        "y": 1096,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2782166b.894a72",\r
+        "id": "64775e7a.bf3908",\r
         "type": "set",\r
         "name": "set domain B tunnel tp id",\r
-        "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",\r
         "comments": "",\r
-        "x": 4546,\r
-        "y": 1052,\r
-        "z": "f861838.07df98",\r
+        "x": 4659.9998779296875,\r
+        "y": 1041,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93bc95bd.015218",\r
+        "id": "8aefd07e.260d8",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4698,\r
-        "y": 260,\r
-        "z": "f861838.07df98",\r
+        "x": 4811.9998779296875,\r
+        "y": 249,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "12aa4902.54d527"\r
+                "4f8861e6.824728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12aa4902.54d527",\r
+        "id": "4f8861e6.824728",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4875,\r
-        "y": 252,\r
-        "z": "f861838.07df98",\r
+        "x": 4988.9998779296875,\r
+        "y": 241,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e133ac15.1cfeb8",\r
-                "50016229.5d7aa4",\r
-                "9731bbf6.0aee28"\r
+                "8261f1c0.e8f31",\r
+                "36d8211f.467a7e",\r
+                "49234c70.a5c64c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e133ac15.1cfeb8",\r
+        "id": "8261f1c0.e8f31",\r
         "type": "set",\r
         "name": "set domain A network-id",\r
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 5090,\r
-        "y": 233,\r
-        "z": "f861838.07df98",\r
+        "x": 5203.9998779296875,\r
+        "y": 222,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50016229.5d7aa4",\r
+        "id": "36d8211f.467a7e",\r
         "type": "get-resource",\r
         "name": "get-resource src network-resource",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5107,\r
-        "y": 297,\r
-        "z": "f861838.07df98",\r
+        "x": 5220.9998779296875,\r
+        "y": 286,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "64fc1e3d.6c54a8"\r
+                "92167a44.d7bee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64fc1e3d.6c54a8",\r
+        "id": "92167a44.d7bee",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5330.5,\r
-        "y": 298,\r
-        "z": "f861838.07df98",\r
+        "x": 5444.4998779296875,\r
+        "y": 287,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "269c6440.2d1124"\r
+                "eafcd68a.31cbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "269c6440.2d1124",\r
+        "id": "eafcd68a.31cbf",\r
         "type": "set",\r
         "name": "set domain A network-id, topo-id, client-id, etc",\r
-        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n",\r
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",\r
         "comments": "",\r
-        "x": 5595,\r
-        "y": 287,\r
-        "z": "f861838.07df98",\r
+        "x": 5708.9998779296875,\r
+        "y": 276,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5b2333f.df7ba8",\r
+        "id": "8e112ac6.c7732",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4300,\r
-        "y": 256,\r
-        "z": "f861838.07df98",\r
+        "x": 4413.9998779296875,\r
+        "y": 245,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "4f6b55da.d022d4"\r
+                "7a3db7fd.944d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f6b55da.d022d4",\r
+        "id": "7a3db7fd.944d68",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4495,\r
-        "y": 256,\r
-        "z": "f861838.07df98",\r
+        "x": 4608.9998779296875,\r
+        "y": 245,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "93bc95bd.015218"\r
+                "8aefd07e.260d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9731bbf6.0aee28",\r
+        "id": "49234c70.a5c64c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5034,\r
-        "y": 350,\r
-        "z": "f861838.07df98",\r
+        "x": 5147.9998779296875,\r
+        "y": 339,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c5d340f.626864",\r
+        "id": "cfa839ce.804738",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4301,\r
-        "y": 863,\r
-        "z": "f861838.07df98",\r
+        "x": 4414.9998779296875,\r
+        "y": 852,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a0eb4786.ca84c8"\r
+                "4d05ba94.558ef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0eb4786.ca84c8",\r
+        "id": "4d05ba94.558ef4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4496,\r
-        "y": 863,\r
-        "z": "f861838.07df98",\r
+        "x": 4609.9998779296875,\r
+        "y": 852,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "b11078d7.b3b858"\r
+                "5d78c070.cc21d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d1ae1e8.8376b8",\r
+        "id": "5c18dd82.55be5c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5120,\r
-        "y": 943,\r
-        "z": "f861838.07df98",\r
+        "x": 5233.9998779296875,\r
+        "y": 932,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6fa2423a.fd13dc",\r
+        "id": "c69a19d0.8fe6d",\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.src-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3804,\r
-        "y": 86,\r
-        "z": "f861838.07df98",\r
+        "x": 3917.9998779296875,\r
+        "y": 75,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "c37dc1f9.38a388",\r
-                "f701d80.fcde128"\r
+                "4ca85973.1ae2a",\r
+                "285acc14.d6b794"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f701d80.fcde128",\r
+        "id": "285acc14.d6b794",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4025,\r
-        "y": 54,\r
-        "z": "f861838.07df98",\r
+        "x": 4138.9998779296875,\r
+        "y": 43,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "72fa8a9d.201954"\r
+                "2fdf8051.c7f6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c37dc1f9.38a388",\r
+        "id": "4ca85973.1ae2a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4025,\r
-        "y": 101,\r
-        "z": "f861838.07df98",\r
+        "x": 4138.9998779296875,\r
+        "y": 90,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "11d67749.03e0d9"\r
+                "be0791af.66d9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72fa8a9d.201954",\r
+        "id": "2fdf8051.c7f6a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4190,\r
-        "y": 51,\r
-        "z": "f861838.07df98",\r
+        "x": 4303.9998779296875,\r
+        "y": 40,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "bbea1bea.ff9688"\r
+                "a66ce9ac.c44538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbea1bea.ff9688",\r
+        "id": "a66ce9ac.c44538",\r
         "type": "set",\r
         "name": "set domain-A.ltpId",\r
-        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n",\r
+        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",\r
         "comments": "",\r
-        "x": 4372,\r
-        "y": 55,\r
-        "z": "f861838.07df98",\r
+        "x": 4485.9998779296875,\r
+        "y": 44,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11d67749.03e0d9",\r
+        "id": "be0791af.66d9e",\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": 4192,\r
-        "y": 101,\r
-        "z": "f861838.07df98",\r
+        "x": 4305.9998779296875,\r
+        "y": 90,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88a4d7d3.2c52b",\r
+        "id": "c1a0d70e.9bb548",\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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3812,\r
-        "y": 710,\r
-        "z": "f861838.07df98",\r
+        "x": 3925.9998779296875,\r
+        "y": 699,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "584895a0.b3ab74",\r
-                "d8e0f12d.021a28"\r
+                "50687959.886b6",\r
+                "99d4fed5.f7a3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8e0f12d.021a28",\r
+        "id": "99d4fed5.f7a3f",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4033,\r
-        "y": 678,\r
-        "z": "f861838.07df98",\r
+        "x": 4146.9998779296875,\r
+        "y": 667,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "18ffb32b.dc39ad"\r
+                "9d94fa7.027cb88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "584895a0.b3ab74",\r
+        "id": "50687959.886b6",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4033,\r
-        "y": 725,\r
-        "z": "f861838.07df98",\r
+        "x": 4146.9998779296875,\r
+        "y": 714,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "5fcd9d7d.d620cc"\r
+                "7a52ffa3.7e9d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18ffb32b.dc39ad",\r
+        "id": "9d94fa7.027cb88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4198,\r
-        "y": 675,\r
-        "z": "f861838.07df98",\r
+        "x": 4311.9998779296875,\r
+        "y": 664,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "ef90ab42.074438"\r
+                "675b55d9.b9c0ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef90ab42.074438",\r
+        "id": "675b55d9.b9c0ec",\r
         "type": "set",\r
         "name": "set domain-B.ltpId",\r
-        "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n",\r
+        "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",\r
         "comments": "",\r
-        "x": 4394,\r
-        "y": 672,\r
-        "z": "f861838.07df98",\r
+        "x": 4507.9998779296875,\r
+        "y": 661,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fcd9d7d.d620cc",\r
+        "id": "7a52ffa3.7e9d28",\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": 4200,\r
-        "y": 725,\r
-        "z": "f861838.07df98",\r
+        "x": 4313.9998779296875,\r
+        "y": 714,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9a4e12.dabba2",\r
+        "id": "20564e8a.e84492",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<parameter name='tmp.aai.cross-link' value='' />\n<parameter name='tmp.aai.cross-link.' value='' />\n<parameter name='tmp.aai.cross-link.link-role' value='' />",\r
         "comments": "",\r
-        "x": 1154,\r
-        "y": 495,\r
-        "z": "f861838.07df98",\r
+        "x": 1183,\r
+        "y": 501,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4129dee.e1028",\r
+        "id": "56dc1543.ce88ec",\r
         "type": "switchNode",\r
         "name": "switch value == start-node",\r
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2990,\r
-        "y": 265,\r
-        "z": "f861838.07df98",\r
+        "x": 3103.9998779296875,\r
+        "y": 254,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "c507ecc7.0f698"\r
+                "a156113e.6f73f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55770297.b0eaec",\r
+        "id": "f7b52e29.d7e28",\r
         "type": "outcome",\r
         "name": "otn-oof.start-node",\r
         "xml": "<outcome value='`$otn-oof.start-node`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3142,\r
-        "y": 180,\r
-        "z": "f861838.07df98",\r
+        "x": 3255.9998779296875,\r
+        "y": 169,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e83d3f89.4fb8f",\r
+        "id": "fcffac67.9ba8e",\r
         "type": "outcome",\r
         "name": "otn-oof.end-node",\r
         "xml": "<outcome value='`$otn-oof.end-node`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3145,\r
-        "y": 399,\r
-        "z": "f861838.07df98",\r
+        "x": 3258.9998779296875,\r
+        "y": 388,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e09f6c32.6da1e8",\r
+        "id": "edb2a900.9a7b1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3320,\r
-        "y": 249,\r
-        "z": "f861838.07df98",\r
+        "x": 3433.9998779296875,\r
+        "y": 238,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "a9fc0be8.cb4e7"\r
+                "614113e.09a2a6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bd5ba40.547cce",\r
+        "id": "bc992c4c.01fac8",\r
         "type": "set",\r
         "name": "set dst-ltpId",\r
-        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->\n\n",\r
         "comments": "",\r
-        "x": 3517,\r
-        "y": 335,\r
-        "z": "f861838.07df98",\r
+        "x": 3630.9998779296875,\r
+        "y": 324,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf0c687c.786c3",\r
+        "id": "4fb57d55.78b35c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3500,\r
-        "y": 375,\r
-        "z": "f861838.07df98",\r
+        "x": 3613.9998779296875,\r
+        "y": 364,\r
+        "z": "97fec48c.8eada",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e18153ce.f19278",\r
+        "id": "7a290eee.406588",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3338,\r
-        "y": 347,\r
-        "z": "f861838.07df98",\r
+        "x": 3451.9998779296875,\r
+        "y": 336,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "3bd5ba40.547cce"\r
+                "bc992c4c.01fac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c507ecc7.0f698",\r
+        "id": "a156113e.6f73f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3178,\r
-        "y": 252,\r
-        "z": "f861838.07df98",\r
+        "x": 3291.9998779296875,\r
+        "y": 241,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e09f6c32.6da1e8"\r
+                "edb2a900.9a7b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b41d356.da9dfc",\r
+        "id": "b07af7fc.6b63b8",\r
         "type": "switchNode",\r
         "name": "switch value == end-node",\r
         "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2988,\r
-        "y": 329,\r
-        "z": "f861838.07df98",\r
+        "x": 3101.9998779296875,\r
+        "y": 318,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            [\r
+                "adae2c31.77bd68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "adae2c31.77bd68",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3286.9998779296875,\r
+        "y": 322,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            [\r
+                "7a290eee.406588"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fdcdd209.036438",\r
+        "type": "comment",\r
+        "name": "Not useful anymore",\r
+        "info": "this domain-A.ltpId is not used anymore",\r
+        "comments": "",\r
+        "x": 4528.9998779296875,\r
+        "y": 20,\r
+        "z": "97fec48c.8eada",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "335fd86d.6b1ff",\r
+        "type": "comment",\r
+        "name": "Not useful anymore",\r
+        "info": "this domain-B.ltpId is not used anymore",\r
+        "comments": "",\r
+        "x": 4550.9998779296875,\r
+        "y": 633,\r
+        "z": "97fec48c.8eada",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b9740a82.273f8",\r
+        "type": "switchNode",\r
+        "name": "test $vidx == first",\r
+        "xml": "<switch test='`$vidx == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2366,\r
+        "y": 100,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "2bcfa57c.bd2fea"\r
+                "fac1138.38454f",\r
+                "4fd6928.61fb8ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bcfa57c.bd2fea",\r
+        "id": "fac1138.38454f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3173,\r
-        "y": 333,\r
-        "z": "f861838.07df98",\r
+        "x": 2550,\r
+        "y": 62,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4fd6928.61fb8ec",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2548,\r
+        "y": 131,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            [\r
+                "49bef92e.99a498"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49bef92e.99a498",\r
+        "type": "switchNode",\r
+        "name": "test $vidx == last",\r
+        "xml": "<switch test='`$vidx == $otn-oof.solutions_length - 1`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2729,\r
+        "y": 128,\r
+        "z": "97fec48c.8eada",\r
         "wires": [\r
             [\r
-                "e18153ce.f19278"\r
+                "4a491f2.2eab56",\r
+                "98392658.063f78"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "98392658.063f78",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 167,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4a491f2.2eab56",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2897,\r
+        "y": 93,\r
+        "z": "97fec48c.8eada",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3d2e0b8f.457abc",\r
+        "type": "set",\r
+        "name": "unset parameters",\r
+        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<parameter name='`tmp.otninfo_length`' value='0' />",\r
+        "comments": "",\r
+        "x": 829,\r
+        "y": 402,\r
+        "z": "97fec48c.8eada",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d9b3c779.af79",\r
+        "type": "comment",\r
+        "name": "May not be necessary",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 841,\r
+        "y": 370,\r
+        "z": "97fec48c.8eada",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file
index 1e6a51c..5681c26 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d9508d21.fa5b3",\r
+        "id": "c170e1ed.7b781",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 144,\r
-        "y": 116,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 137,\r
+        "y": 82,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "cae32381.bce9d"\r
+                "9970ac63.cab4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cae32381.bce9d",\r
+        "id": "9970ac63.cab4e",\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": 275.2856903076172,\r
-        "y": 165.23810863494873,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 268.2856903076172,\r
+        "y": 131.23810863494873,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "82cfa8a0.a91dc"\r
+                "d984e08f.709ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82cfa8a0.a91dc",\r
+        "id": "d984e08f.709ec8",\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": 278.4286193847656,\r
-        "y": 250.00003242492676,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 271.4286193847656,\r
+        "y": 216.00003242492676,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "f6fef19d.8fc9f8"\r
+                "8e4db78f.c5ff38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6fef19d.8fc9f8",\r
+        "id": "8e4db78f.c5ff38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 428.238037109375,\r
-        "y": 379.6666564941406,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 421.238037109375,\r
+        "y": 345.6666564941406,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "c70167ce.7f9118",\r
-                "6aca196e.a4377",\r
-                "e86e6571.913898"\r
+                "6bde1442.84f93c",\r
+                "d81cbe5a.85cea",\r
+                "2a368168.cab60e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c70167ce.7f9118",\r
+        "id": "6bde1442.84f93c",\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": 696.5716552734375,\r
-        "y": 766.59716796875,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 689.5716552734375,\r
+        "y": 732.59716796875,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d841551.d686928",\r
+        "id": "233d87e5.a24f7",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 728,\r
-        "y": 441,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 721,\r
+        "y": 407,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6aca196e.a4377",\r
+        "id": "d81cbe5a.85cea",\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": 748,\r
-        "y": 537,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 741,\r
+        "y": 503,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "8dfdefd.d3d4d9",\r
-                "f6a9e3a5.f26778",\r
-                "6cad2633.e5f528"\r
+                "b0036e6b.1878c8",\r
+                "7901c2f.e699b3c",\r
+                "120c06e4.dff209"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8dfdefd.d3d4d9",\r
+        "id": "b0036e6b.1878c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967,\r
-        "y": 475,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 960,\r
+        "y": 441,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "f2dd8538.5d3378"\r
+                "9167ffc3.5d91a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6a9e3a5.f26778",\r
+        "id": "7901c2f.e699b3c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 976.490966796875,\r
-        "y": 517.5740356445312,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 969.490966796875,\r
+        "y": 483.57403564453125,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "59b21b6f.e70b7c"\r
+                "fe34f5d.3d31308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cad2633.e5f528",\r
+        "id": "120c06e4.dff209",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 965,\r
-        "y": 564,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 958,\r
+        "y": 530,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "95c7d05e.93c3e"\r
+                "6d39868f.7f25c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59b21b6f.e70b7c",\r
+        "id": "fe34f5d.3d31308",\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": 1130.0623779296875,\r
-        "y": 520.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1123.0623779296875,\r
+        "y": 486.8597717285156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95c7d05e.93c3e",\r
+        "id": "6d39868f.7f25c8",\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": 1134,\r
-        "y": 565,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1127,\r
+        "y": 531,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2dd8538.5d3378",\r
+        "id": "9167ffc3.5d91a",\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": 1164,\r
-        "y": 471,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1157,\r
+        "y": 437,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "94e5618.e7d282"\r
+                "5c1ddd56.ddffa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94e5618.e7d282",\r
+        "id": "5c1ddd56.ddffa4",\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": 1387.33349609375,\r
-        "y": 470.99993896484375,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1380.33349609375,\r
+        "y": 436.99993896484375,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "32140056.199ae"\r
+                "aeacbf90.6ab9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32140056.199ae",\r
+        "id": "aeacbf90.6ab9e",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1588.0001335144043,\r
-        "y": 472.00002098083496,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1581.0001335144043,\r
+        "y": 438.00002098083496,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "9174febc.b8b998"\r
+                "7ea091c4.73eb6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25e7d332.a761fc",\r
+        "id": "fd4d27b6.bd205",\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-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\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": 3849,\r
-        "y": 191,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4400,\r
+        "y": 154,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fee47d9.4382e",\r
+        "id": "7648091a.a03898",\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": 3930,\r
-        "y": 506,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4481,\r
+        "y": 469,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "445402d7.16a9f4",\r
-                "d34714f7.10a51"\r
+                "9edc273d.67b87",\r
+                "9c60eb24.47f378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "445402d7.16a9f4",\r
+        "id": "9edc273d.67b87",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4239.5,\r
-        "y": 475,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4790.5,\r
+        "y": 438,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "69fb5a0d.27a12c"\r
+                "9905c30a.05be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d34714f7.10a51",\r
+        "id": "9c60eb24.47f378",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4244.5,\r
-        "y": 540,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4795.5,\r
+        "y": 503,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "f0eccde.2c0533"\r
+                "8e92f9d2.75f4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69fb5a0d.27a12c",\r
+        "id": "9905c30a.05be",\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": 4415.5,\r
-        "y": 475,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4966.5,\r
+        "y": 438,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0eccde.2c0533",\r
+        "id": "8e92f9d2.75f4a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4411,\r
-        "y": 540,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4962,\r
+        "y": 503,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a96cdedb.06ef48",\r
+        "id": "7974f996.7603f8",\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='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<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
         "comments": "",\r
-        "x": 3796.5,\r
-        "y": 694,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4347.5,\r
+        "y": 657,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "616c98c7.f82ea8",\r
+        "id": "1460b865.7cff48",\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": 3950.5,\r
-        "y": 742,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4501.5,\r
+        "y": 705,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "eef8ae3.fdd1a5",\r
-                "8f2e62b6.e98788"\r
+                "d6a6995b.244f78",\r
+                "3058a60d.1382f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eef8ae3.fdd1a5",\r
+        "id": "d6a6995b.244f78",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4296,\r
-        "y": 723,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4847,\r
+        "y": 686,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "f08a069b.6042c8"\r
+                "9008a0fb.361338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f2e62b6.e98788",\r
+        "id": "3058a60d.1382f2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4300,\r
-        "y": 763,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4851,\r
+        "y": 726,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "b227b2c.229c1d"\r
+                "5c04d202.902b9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f08a069b.6042c8",\r
+        "id": "9008a0fb.361338",\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": 4454,\r
-        "y": 723,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5005,\r
+        "y": 686,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b227b2c.229c1d",\r
+        "id": "5c04d202.902b9c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4457.5,\r
-        "y": 763,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5008.5,\r
+        "y": 726,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "2af71c81.1e5aec",\r
-                "5fe9896d.3d8e98"\r
+                "ec17d55b.a0804",\r
+                "144849a3.b4133e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5970f4b.9679a8",\r
+        "id": "471d2a77.3a42ac",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3794,\r
-        "y": 650,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4345,\r
+        "y": 613,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2af71c81.1e5aec",\r
+        "id": "ec17d55b.a0804",\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-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4788,\r
-        "y": 728,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5339,\r
+        "y": 691,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48dd1ec4.51cb4",\r
+        "id": "4e9eb117.9357d",\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": 4652,\r
-        "y": 687,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5203,\r
+        "y": 650,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fe9896d.3d8e98",\r
+        "id": "144849a3.b4133e",\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": 4715,\r
-        "y": 774,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5266,\r
+        "y": 737,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75d6c996.11aeb",\r
+        "id": "4f40e2d1.4262ec",\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": 3787,\r
-        "y": 239,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4338,\r
+        "y": 202,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c824ab5b.360f6",\r
+        "id": "8abcb98.e721cc8",\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": 3813,\r
-        "y": 356,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4364,\r
+        "y": 319,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "19cd8085.d8fca7",\r
-                "ff1311fc.28b29",\r
-                "929f1027.4a5828"\r
+                "3115ae28.00936a",\r
+                "34440f82.2778b8",\r
+                "5e322ae1.288484"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19cd8085.d8fca7",\r
+        "id": "3115ae28.00936a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4008.5001220703125,\r
-        "y": 308,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4559.5001220703125,\r
+        "y": 271,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "a2185ea8.7f403"\r
+                "5640c3a4.e53454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff1311fc.28b29",\r
+        "id": "34440f82.2778b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4000.5001220703125,\r
-        "y": 363,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4551.5001220703125,\r
+        "y": 326,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "c3cea897.f88808"\r
+                "b5a71ca6.0ed8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2185ea8.7f403",\r
+        "id": "5640c3a4.e53454",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4152.8824462890625,\r
-        "y": 307.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4703.8824462890625,\r
+        "y": 270.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "eb7f6fc2.5f3468"\r
+                "4125afdc.dc7c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0fa7da8.75192",\r
+        "id": "e2a3abe6.94632",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4735,\r
-        "y": 310,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5286,\r
+        "y": 273,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "809287e6.83f07"\r
+                "e7a85e47.2ddf5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb7f6fc2.5f3468",\r
+        "id": "4125afdc.dc7c38",\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": 4337,\r
-        "y": 306,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4888,\r
+        "y": 269,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "21971ee2.f88962"\r
+                "7289fd85.50ab7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21971ee2.f88962",\r
+        "id": "7289fd85.50ab7c",\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": 4532,\r
-        "y": 306,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5083,\r
+        "y": 269,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "a0fa7da8.75192"\r
+                "e2a3abe6.94632"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "929f1027.4a5828",\r
+        "id": "5e322ae1.288484",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4005.5001220703125,\r
-        "y": 420,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4556.5001220703125,\r
+        "y": 383,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "5ece63ab.72534c"\r
+                "a5591b6a.a340a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ece63ab.72534c",\r
+        "id": "a5591b6a.a340a8",\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": 4157.5001220703125,\r
-        "y": 421,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4708.5001220703125,\r
+        "y": 384,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3cea897.f88808",\r
+        "id": "b5a71ca6.0ed8a",\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": 4168.5001220703125,\r
-        "y": 364,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4719.5001220703125,\r
+        "y": 327,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd9485b.71b4af8",\r
+        "id": "ca9f1df7.d822c",\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": 5120,\r
-        "y": 323,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5671,\r
+        "y": 286,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "12fe3fd6.ccef78",\r
-                "5cf62e0d.6aa85",\r
-                "156d902b.c3731"\r
+                "d6fa81cb.78d2d",\r
+                "bcf1b063.c95248",\r
+                "109a3661.2bbbd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "809287e6.83f07",\r
+        "id": "e7a85e47.2ddf5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4914,\r
-        "y": 310,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5465,\r
+        "y": 273,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "a1955015.d4546",\r
-                "fd9485b.71b4af8"\r
+                "211b93a9.ce5f0c",\r
+                "ca9f1df7.d822c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1955015.d4546",\r
+        "id": "211b93a9.ce5f0c",\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": 5150,\r
-        "y": 271,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5701,\r
+        "y": 234,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12fe3fd6.ccef78",\r
+        "id": "d6fa81cb.78d2d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5330,\r
-        "y": 314,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5881,\r
+        "y": 277,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "cc3a75a4.21fc7"\r
+                "bf2e4f3b.81ed8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5cf62e0d.6aa85",\r
+        "id": "bcf1b063.c95248",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5322,\r
-        "y": 369,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5873,\r
+        "y": 332,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "bff3bfa.5f55cc"\r
+                "bfa4b512.849248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "156d902b.c3731",\r
+        "id": "109a3661.2bbbd2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5327,\r
-        "y": 426,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5878,\r
+        "y": 389,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "be590afe.7cc5a8"\r
+                "76f805.e622cffc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be590afe.7cc5a8",\r
+        "id": "76f805.e622cffc",\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": 5479,\r
-        "y": 427,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6030,\r
+        "y": 390,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bff3bfa.5f55cc",\r
+        "id": "bfa4b512.849248",\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": 5490,\r
-        "y": 372,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6041,\r
+        "y": 335,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc3a75a4.21fc7",\r
+        "id": "bf2e4f3b.81ed8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5474.38232421875,\r
-        "y": 311.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6025.38232421875,\r
+        "y": 274.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "665ad654.79ee8"\r
+                "76b40334.8bd094"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "665ad654.79ee8",\r
+        "id": "76b40334.8bd094",\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": 5689,\r
-        "y": 308,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6240,\r
+        "y": 271,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e86e6571.913898",\r
+        "id": "2a368168.cab60e",\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": 714,\r
-        "y": 485,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 707,\r
+        "y": 451,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "27bc86e9.1c4e52",\r
+        "id": "3bea0429.f0ebac",\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-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\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": 3829,\r
-        "y": 995,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3807,\r
+        "y": 1611,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8350413.ea8398",\r
+        "id": "d501f859.eecd18",\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": 3892,\r
-        "y": 1324,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3870,\r
+        "y": 1940,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "4e841df5.4d2d34",\r
-                "5e6f0ddb.0967b4"\r
+                "8a516999.f983f8",\r
+                "e1e3477c.cb45b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e841df5.4d2d34",\r
+        "id": "8a516999.f983f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4187.5,\r
-        "y": 1291,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4165.5,\r
+        "y": 1907,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "8fb2eae.74bbb98"\r
+                "1f32cbd.2007fb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e6f0ddb.0967b4",\r
+        "id": "e1e3477c.cb45b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4192.5,\r
-        "y": 1356,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4170.5,\r
+        "y": 1972,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "9fef13b3.660c58"\r
+                "5be15aea.63aa2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fb2eae.74bbb98",\r
+        "id": "1f32cbd.2007fb4",\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": 4355.5,\r
-        "y": 1291,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4333.5,\r
+        "y": 1907,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fef13b3.660c58",\r
+        "id": "5be15aea.63aa2c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4366,\r
-        "y": 1356,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4344,\r
+        "y": 1972,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2fd670.86d5219",\r
+        "id": "32f45e6c.4d0bea",\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": 3768,\r
-        "y": 1052,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3746,\r
+        "y": 1668,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8581969f.3e9f8",\r
+        "id": "e8ca7925.e0f8c",\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": 3788,\r
-        "y": 1149,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3766,\r
+        "y": 1765,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "3c9a5980.f5df5e",\r
-                "6737c173.340e3",\r
-                "68a240da.0733"\r
+                "9bb092a5.d05b48",\r
+                "221dd2f3.9ac236",\r
+                "26d51b0f.5d004c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c9a5980.f5df5e",\r
+        "id": "9bb092a5.d05b48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3990.5001220703125,\r
-        "y": 1102,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3968.5001220703125,\r
+        "y": 1718,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "ea38c477.b7b2f"\r
+                "b690bac2.55724"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6737c173.340e3",\r
+        "id": "221dd2f3.9ac236",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3982.5001220703125,\r
-        "y": 1157,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3960.5001220703125,\r
+        "y": 1773,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "8bbc992f.718ea"\r
+                "b19648bb.51984"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea38c477.b7b2f",\r
+        "id": "b690bac2.55724",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4134.8824462890625,\r
-        "y": 1099.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4112.8824462890625,\r
+        "y": 1715.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "18cecfe3.6de9e"\r
+                "bc889fde.13a798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18cecfe3.6de9e",\r
+        "id": "bc889fde.13a798",\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": 4319,\r
-        "y": 1114,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4297,\r
+        "y": 1730,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "68f9f038.67b62"\r
+                "6cdbe20d.6924d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68a240da.0733",\r
+        "id": "26d51b0f.5d004c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3987.5001220703125,\r
-        "y": 1214,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3965.5001220703125,\r
+        "y": 1830,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "20686ade.8b231e"\r
+                "5f4cb2c4.11fb94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20686ade.8b231e",\r
+        "id": "5f4cb2c4.11fb94",\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": 4139.5001220703125,\r
-        "y": 1215,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4117.5001220703125,\r
+        "y": 1831,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bbc992f.718ea",\r
+        "id": "b19648bb.51984",\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": 4150.5001220703125,\r
-        "y": 1160,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4128.5001220703125,\r
+        "y": 1776,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "597aa62c.50d3c",\r
+        "id": "73a1b393.2e09c4",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4717,\r
-        "y": 1118,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4695,\r
+        "y": 1734,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "e04d6fa3.eba9f"\r
+                "ab9ee354.2292b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68f9f038.67b62",\r
+        "id": "6cdbe20d.6924d4",\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": 4514,\r
-        "y": 1114,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4492,\r
+        "y": 1730,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "597aa62c.50d3c"\r
+                "73a1b393.2e09c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f50548b.6d0f1c",\r
+        "id": "1f5d9d19.39869b",\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": 5102,\r
-        "y": 1117,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5080,\r
+        "y": 1733,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "a769e440.df581",\r
-                "a7207c49.d2bbc",\r
-                "1e0583ed.3bab5c"\r
+                "9355225.5c1536",\r
+                "66c76394.d1fea4",\r
+                "2e8b8501.9ee95a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e04d6fa3.eba9f",\r
+        "id": "ab9ee354.2292b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4894,\r
-        "y": 1110,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4872,\r
+        "y": 1726,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "eacacb80.08d4c",\r
-                "2f50548b.6d0f1c"\r
+                "28e5278d.3f4238",\r
+                "1f5d9d19.39869b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eacacb80.08d4c",\r
+        "id": "28e5278d.3f4238",\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": 5132,\r
-        "y": 1065,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5110,\r
+        "y": 1681,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61827e75.b97ad8",\r
+        "id": "8616ea00.2e5968",\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": 5461,\r
-        "y": 1221,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5439,\r
+        "y": 1837,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6c7c29b.5ee08",\r
+        "id": "8ef11dae.da91",\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": 5472,\r
-        "y": 1166,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5450,\r
+        "y": 1782,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c1b7b20.2d7bbc",\r
+        "id": "d4ab39c.829a8c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5456.38232421875,\r
-        "y": 1105.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5434.38232421875,\r
+        "y": 1721.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "9190ad56.af3378"\r
+                "4d0c934c.0c9114"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9190ad56.af3378",\r
+        "id": "4d0c934c.0c9114",\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": 5671,\r
-        "y": 1102,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5649,\r
+        "y": 1718,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a769e440.df581",\r
+        "id": "9355225.5c1536",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5312,\r
-        "y": 1108,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5290,\r
+        "y": 1724,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "7c1b7b20.2d7bbc"\r
+                "d4ab39c.829a8c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7207c49.d2bbc",\r
+        "id": "66c76394.d1fea4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5304,\r
-        "y": 1163,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5282,\r
+        "y": 1779,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "b6c7c29b.5ee08"\r
+                "8ef11dae.da91"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e0583ed.3bab5c",\r
+        "id": "2e8b8501.9ee95a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5309,\r
-        "y": 1220,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5287,\r
+        "y": 1836,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "61827e75.b97ad8"\r
+                "8616ea00.2e5968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9174febc.b8b998",\r
+        "id": "7ea091c4.73eb6",\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": 1826,\r
-        "y": 474,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1819,\r
+        "y": 440,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "c96ce0ff.9fbaf8",\r
-                "96dddcba.eaaec8",\r
-                "4ccaabcc.f5bb34"\r
+                "cf96a339.12fc08",\r
+                "ebf1abf2.c0a2b8",\r
+                "a6813928.711c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c96ce0ff.9fbaf8",\r
+        "id": "cf96a339.12fc08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2034,\r
-        "y": 438,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2027,\r
+        "y": 404,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "5281d926.1c9dd"\r
+                "7e9b774d.9e8c28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96dddcba.eaaec8",\r
+        "id": "ebf1abf2.c0a2b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2034.490966796875,\r
-        "y": 483.57403564453125,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2027.490966796875,\r
+        "y": 449.57403564453125,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "50a19d40.768324"\r
+                "b2e1099a.08fc3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ccaabcc.f5bb34",\r
+        "id": "a6813928.711c6",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032,\r
-        "y": 527,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2025,\r
+        "y": 493,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "ffedf4ef.62de2"\r
+                "8f5ccf37.c152"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50a19d40.768324",\r
+        "id": "b2e1099a.08fc3",\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": 2197.0623779296875,\r
-        "y": 483.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2190.0623779296875,\r
+        "y": 449.8597717285156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffedf4ef.62de2",\r
+        "id": "8f5ccf37.c152",\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": 2201,\r
-        "y": 528,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2194,\r
+        "y": 494,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "113dd07d.86f868",\r
+        "id": "2f04c146.0a3af6",\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": 2507,\r
-        "y": 527,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2500,\r
+        "y": 493,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "2b6a4b71.479d3c",\r
-                "34c32e6f.a9d052",\r
-                "c2c66c33.7e24d"\r
+                "675654a6.d7ff34",\r
+                "15ae8ffb.52d9c8",\r
+                "5de62fdc.3f5a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a40580d.1d5388",\r
+        "id": "c4252359.e0b548",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2891,\r
-        "y": 527,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2884,\r
+        "y": 493,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "eeee2acf.9c0ba8",\r
-                "57847c7b.2f3dbc"\r
+                "cf117e36.f49698",\r
+                "9e15ad66.cb5638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b6a4b71.479d3c",\r
+        "id": "675654a6.d7ff34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2718,\r
-        "y": 529,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2711,\r
+        "y": 495,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "7a40580d.1d5388"\r
+                "c4252359.e0b548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34c32e6f.a9d052",\r
+        "id": "15ae8ffb.52d9c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2718.490966796875,\r
-        "y": 574.5740356445312,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2711.490966796875,\r
+        "y": 540.5740356445312,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "17c937f3.281d28"\r
+                "1c0c1f66.646011"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2c66c33.7e24d",\r
+        "id": "5de62fdc.3f5a78",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716,\r
-        "y": 618,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2709,\r
+        "y": 584,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "45484d04.351e94"\r
+                "96b5913.ff6507"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45484d04.351e94",\r
+        "id": "96b5913.ff6507",\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": 2883,\r
-        "y": 617,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2876,\r
+        "y": 583,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17c937f3.281d28",\r
+        "id": "1c0c1f66.646011",\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": 2881.0623779296875,\r
-        "y": 574.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2874.0623779296875,\r
+        "y": 540.8597717285156,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5281d926.1c9dd",\r
+        "id": "7e9b774d.9e8c28",\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": 2235,\r
-        "y": 433,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2228,\r
+        "y": 399,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "24c8cf8c.d35f5"\r
+                "a33b5641.550dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24c8cf8c.d35f5",\r
+        "id": "a33b5641.550dd8",\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": 2440,\r
-        "y": 433,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2433,\r
+        "y": 399,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "ffd8562e.6c7ab"\r
+                "dcc9c2f.bdc72c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd8562e.6c7ab",\r
+        "id": "dcc9c2f.bdc72c",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2606,\r
-        "y": 433,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2599,\r
+        "y": 399,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "1639e360.7db745"\r
+                "b86471e.744979"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1639e360.7db745",\r
+        "id": "b86471e.744979",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2769,\r
-        "y": 433,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2762,\r
+        "y": 399,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "113dd07d.86f868",\r
-                "b864657f.9c5a"\r
+                "2f04c146.0a3af6",\r
+                "65e4f8bf.6cf8f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eeee2acf.9c0ba8",\r
+        "id": "cf117e36.f49698",\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": 3145,\r
-        "y": 526,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3138,\r
+        "y": 492,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "888039c0.be2748",\r
-                "40c5843d.11f78c"\r
+                "965ac3c2.a1d608",\r
+                "6bf420f8.6129c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "888039c0.be2748",\r
+        "id": "965ac3c2.a1d608",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3398,\r
-        "y": 560,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3391,\r
+        "y": 526,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "d751d093.92a62"\r
+                "f82e8947.2d7ce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40c5843d.11f78c",\r
+        "id": "6bf420f8.6129c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3398,\r
-        "y": 504,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3391,\r
+        "y": 470,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "ddefc1a3.6644c8"\r
+                "aacf39c3.b541a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d751d093.92a62",\r
+        "id": "f82e8947.2d7ce8",\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": 3137,\r
-        "y": 1346,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3115,\r
+        "y": 1962,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "b9609f04.c7afe8",\r
-                "28e97c84.2c5ab4"\r
+                "10da65e0.f509ca",\r
+                "73ba091f.6ce2a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9609f04.c7afe8",\r
+        "id": "10da65e0.f509ca",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3390,\r
-        "y": 1380,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3368,\r
+        "y": 1996,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "ee3de09a.383318"\r
+                "d3f311e2.47dc9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28e97c84.2c5ab4",\r
+        "id": "73ba091f.6ce2a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3390,\r
-        "y": 1324,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3368,\r
+        "y": 1940,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "b80c5827.1a79a"\r
+                "4a6141b6.6b0c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee3de09a.383318",\r
+        "id": "d3f311e2.47dc9",\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": 3541,\r
-        "y": 1380,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3519,\r
+        "y": 1996,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8527e1fa.cc6b4",\r
+        "id": "fb92b32f.578d9",\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": 3844,\r
-        "y": 131,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4395,\r
+        "y": 94,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "615fdc8e.20c4e4",\r
+        "id": "16b6eb5a.c037cd",\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": 3825,\r
-        "y": 937,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3803,\r
+        "y": 1553,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ddefc1a3.6644c8",\r
+        "id": "b5fbea6d.693118",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3566,\r
-        "y": 506,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4086,\r
+        "y": 351,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "8527e1fa.cc6b4",\r
-                "25e7d332.a761fc",\r
-                "75d6c996.11aeb",\r
-                "c824ab5b.360f6",\r
-                "a96cdedb.06ef48",\r
-                "616c98c7.f82ea8",\r
-                "fee47d9.4382e"\r
+                "fb92b32f.578d9",\r
+                "fd4d27b6.bd205",\r
+                "4f40e2d1.4262ec",\r
+                "8abcb98.e721cc8",\r
+                "7974f996.7603f8",\r
+                "1460b865.7cff48",\r
+                "7648091a.a03898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b80c5827.1a79a",\r
+        "id": "4a6141b6.6b0c98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3541,\r
-        "y": 1323,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3519,\r
+        "y": 1939,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "615fdc8e.20c4e4",\r
-                "27bc86e9.1c4e52",\r
-                "2fd670.86d5219",\r
-                "8581969f.3e9f8",\r
-                "f8350413.ea8398",\r
-                "96b5aedc.4196d",\r
-                "e2e659bb.42dea"\r
+                "16b6eb5a.c037cd",\r
+                "3bea0429.f0ebac",\r
+                "32f45e6c.4d0bea",\r
+                "e8ca7925.e0f8c",\r
+                "d501f859.eecd18",\r
+                "dfc89384.6f3b98",\r
+                "7e08fa79.0c018c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96b5aedc.4196d",\r
+        "id": "dfc89384.6f3b98",\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='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<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
         "comments": "",\r
-        "x": 3770,\r
-        "y": 1466,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3748,\r
+        "y": 2082,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e2e659bb.42dea",\r
+        "id": "7e08fa79.0c018c",\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": 3924,\r
-        "y": 1514,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3902,\r
+        "y": 2130,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "a28581db.fa7cb",\r
-                "a3f78a52.db8928"\r
+                "dd71fa1b.6e05f",\r
+                "23079c35.06b53c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a28581db.fa7cb",\r
+        "id": "dd71fa1b.6e05f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4269.5,\r
-        "y": 1495,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4247.5,\r
+        "y": 2111,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "14523534.ce6de3"\r
+                "531e9904.6c0cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3f78a52.db8928",\r
+        "id": "23079c35.06b53c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4273.5,\r
-        "y": 1535,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4251.5,\r
+        "y": 2151,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "2e9384b8.e29014"\r
+                "ca751a91.a1fc5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14523534.ce6de3",\r
+        "id": "531e9904.6c0cf",\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": 4427.5,\r
-        "y": 1495,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4405.5,\r
+        "y": 2111,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e9384b8.e29014",\r
+        "id": "ca751a91.a1fc5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4431,\r
-        "y": 1535,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4409,\r
+        "y": 2151,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             [\r
-                "b54e7482.e242c8",\r
-                "df1f167a.857918"\r
+                "acce8a06.32f9",\r
+                "300cb80e.add27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "364ac531.cfcb5a",\r
+        "id": "ed3d8ab7.5da83",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3767.5,\r
-        "y": 1422,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3745.5,\r
+        "y": 2038,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b54e7482.e242c8",\r
+        "id": "acce8a06.32f9",\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-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4771,\r
-        "y": 1534,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4749,\r
+        "y": 2150,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "68be1db9.7e03ec",\r
+        "id": "dd0732a8.6dcd38",\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": 4629,\r
-        "y": 1492,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4607,\r
+        "y": 2108,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df1f167a.857918",\r
+        "id": "300cb80e.add27",\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": 4700,\r
-        "y": 1583,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4678,\r
+        "y": 2199,\r
+        "z": "bc289cb4.31b288",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57847c7b.2f3dbc",\r
+        "id": "9e15ad66.cb5638",\r
         "type": "set",\r
-        "name": "set attachment_param for OTN",\r
+        "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3132,\r
-        "y": 432,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3125,\r
+        "y": 398,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b864657f.9c5a",\r
+        "id": "65e4f8bf.6cf8f",\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": 2953,\r
-        "y": 304,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2946,\r
+        "y": 270,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "198fcdf8.1e22c2",\r
+        "type": "comment",\r
+        "name": "only dst ttp exists. No src",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3907,\r
+        "y": 308,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ca0cd7a2.5ca728",\r
+        "type": "comment",\r
+        "name": "only src ttp exists. No dst",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3464,\r
+        "y": 1886,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "aacf39c3.b541a",\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": 3615,\r
+        "y": 468,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "df2281b1.f49f38",\r
+                "aea11bc2.879238"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aea11bc2.879238",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3885,\r
+        "y": 1059,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "f4291584.31d5f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "df2281b1.f49f38",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3879,\r
+        "y": 350,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "b5fbea6d.693118"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4291584.31d5f8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4043,\r
+        "y": 1058,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "507acb8a.026844",\r
+                "328f5ebe.d2c3f2",\r
+                "282b55f0.c4b452",\r
+                "f1d5dfc2.902f38",\r
+                "e32fad74.744d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "328f5ebe.d2c3f2",\r
+        "type": "set",\r
+        "name": "set attachment_param for OTN G",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
+        "comments": "",\r
+        "x": 4307,\r
+        "y": 941,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e32fad74.744d",\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-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.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": 4388,\r
+        "y": 1256,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "4fa7d7bd.5a2ab",\r
+                "f472be3.5d0074"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4fa7d7bd.5a2ab",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4697.5,\r
+        "y": 1225,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "1f127e35.6d237a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f472be3.5d0074",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4702.5,\r
+        "y": 1290,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "5d6567d4.56edf"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1f127e35.6d237a",\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": 4873.5,\r
+        "y": 1225,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5d6567d4.56edf",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4869,\r
+        "y": 1290,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "282b55f0.c4b452",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 4245,\r
+        "y": 989,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f1d5dfc2.902f38",\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.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4271,\r
+        "y": 1106,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "b1abc6d5.732f1",\r
+                "5f6c0c85.ca44ac",\r
+                "386d37a9.f48098"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b1abc6d5.732f1",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4466.5001220703125,\r
+        "y": 1058,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "7b990f0b.20c288"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f6c0c85.ca44ac",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4458.5001220703125,\r
+        "y": 1113,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "315f8841.f40a1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7b990f0b.20c288",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4610.8824462890625,\r
+        "y": 1057.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "c8fb728b.2dc648"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8fb728b.2dc648",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4795,\r
+        "y": 1056,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "d59f0b39.d31cc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d59f0b39.d31cc8",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4990,\r
+        "y": 1056,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "7e05c38e.6d5cbc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "386d37a9.f48098",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4463.5001220703125,\r
+        "y": 1170,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "46492ab4.cb6c04"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "46492ab4.cb6c04",\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": 4615.5001220703125,\r
+        "y": 1171,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "315f8841.f40a1",\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": 4626.5001220703125,\r
+        "y": 1114,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "507acb8a.026844",\r
+        "type": "set",\r
+        "name": "set vpn-bindingG and connectivityG",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
+        "comments": "",\r
+        "x": 4302,\r
+        "y": 881,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e05c38e.6d5cbc",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5193,\r
+        "y": 1060,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "436389a3.57fb78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a766cec.04fc1c",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5578,\r
+        "y": 1073,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "985e5e77.801e6",\r
+                "a10da0b1.afaa18",\r
+                "4e466bf1.fc05c4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "436389a3.57fb78",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5372,\r
+        "y": 1060,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "507f9c6b.ef2c2c",\r
+                "6a766cec.04fc1c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "507f9c6b.ef2c2c",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainG id",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5608,\r
+        "y": 1021,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "985e5e77.801e6",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5788,\r
+        "y": 1064,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "37e160ea.8f86d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a10da0b1.afaa18",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5780,\r
+        "y": 1119,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "81ccddb5.3e1b1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4e466bf1.fc05c4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5785,\r
+        "y": 1176,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "c4f4a10b.e46a6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4f4a10b.e46a6",\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": 5937,\r
+        "y": 1177,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "81ccddb5.3e1b1",\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": 5948,\r
+        "y": 1122,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "37e160ea.8f86d8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5932.38232421875,\r
+        "y": 1061.6556701660156,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": [\r
+            [\r
+                "4cbb09e8.a29488"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4cbb09e8.a29488",\r
+        "type": "set",\r
+        "name": "set controller domainG data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 6147,\r
+        "y": 1058,\r
+        "z": "bc289cb4.31b288",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "28d376a3.473102",\r
+        "type": "comment",\r
+        "name": "both src and dst exist",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3921,\r
+        "y": 999,\r
+        "z": "bc289cb4.31b288",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 8c72d0c..b1d61fa 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "187a8cd0.b6793b",\r
+        "id": "df3491bc.625428",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 144,\r
-        "y": 132,\r
-        "z": "4d37a11.42c136",\r
+        "x": 128,\r
+        "y": 113,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "5ea5ad17.ee4964"\r
+                "f93a4fe6.087538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ea5ad17.ee4964",\r
+        "id": "f93a4fe6.087538",\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": 428.2856903076172,\r
-        "y": 193.23810863494873,\r
-        "z": "4d37a11.42c136",\r
+        "x": 412.2856903076172,\r
+        "y": 174.23810863494873,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "9dad8fbc.f24f98"\r
+                "3a78d95d.5e3c5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dad8fbc.f24f98",\r
+        "id": "3a78d95d.5e3c5e",\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": 434.42860412597656,\r
-        "y": 278.0000305175781,\r
-        "z": "4d37a11.42c136",\r
+        "x": 418.42860412597656,\r
+        "y": 259.0000305175781,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "ca46cddf.f67038"\r
+                "35ecb5b7.3f1b02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca46cddf.f67038",\r
+        "id": "35ecb5b7.3f1b02",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 804.238037109375,\r
-        "y": 302.66668701171875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 788.238037109375,\r
+        "y": 283.66668701171875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "506e7f5c.19244",\r
-                "7c740453.8a159c",\r
-                "ac58016f.1c2c1"\r
+                "a99ea7b2.f5e618",\r
+                "183025fe.418fa2",\r
+                "d352d101.d008a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "506e7f5c.19244",\r
+        "id": "a99ea7b2.f5e618",\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": 1105.571533203125,\r
-        "y": 573.5969848632812,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1089.571533203125,\r
+        "y": 554.5969848632812,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c740453.8a159c",\r
+        "id": "183025fe.418fa2",\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": 1127,\r
-        "y": 276,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1111,\r
+        "y": 257,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "78f50d5a.2a0cec",\r
-                "c34c58a5.11a148",\r
-                "f82c0a42.39fea8"\r
+                "47f816cc.c0286",\r
+                "318d2442.efdd34",\r
+                "4265fd48.9eb024"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78f50d5a.2a0cec",\r
+        "id": "47f816cc.c0286",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1352,\r
-        "y": 134,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1336,\r
+        "y": 115,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "dfc9a5db.996c4"\r
+                "6fd78e9c.961b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c34c58a5.11a148",\r
+        "id": "318d2442.efdd34",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1347.490966796875,\r
-        "y": 203.57403564453125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1331.490966796875,\r
+        "y": 184.57403564453125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "5383933.3cbeeec"\r
+                "aa8b68cf.4936c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f82c0a42.39fea8",\r
+        "id": "4265fd48.9eb024",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1336,\r
-        "y": 250,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1320,\r
+        "y": 231,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "3912b121.be04f6"\r
+                "ea9381a6.8a9938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfc9a5db.996c4",\r
+        "id": "6fd78e9c.961b2",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1591,\r
-        "y": 131,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1575,\r
+        "y": 112,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "fea7170c.7030f8",\r
-                "8bbb818c.845db"\r
+                "a9515923.c68db8",\r
+                "3b6a0136.f8dee6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5383933.3cbeeec",\r
+        "id": "aa8b68cf.4936c",\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": 1501.0623779296875,\r
-        "y": 206.85977172851562,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1485.0623779296875,\r
+        "y": 187.85977172851562,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3912b121.be04f6",\r
+        "id": "ea9381a6.8a9938",\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": 1505,\r
-        "y": 251,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1489,\r
+        "y": 232,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fea7170c.7030f8",\r
+        "id": "a9515923.c68db8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1804,\r
-        "y": 155,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1788,\r
+        "y": 136,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "bf993d83.a36c8"\r
+                "8d77a4c9.47348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8bbb818c.845db",\r
+        "id": "3b6a0136.f8dee6",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1806,\r
-        "y": 95,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1790,\r
+        "y": 76,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f5ddac6.6343fd",\r
+        "id": "2b9472b2.e91dbe",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1106,\r
-        "y": 164,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1090,\r
+        "y": 145,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf993d83.a36c8",\r
+        "id": "8d77a4c9.47348",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1789,\r
-        "y": 243,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1773,\r
+        "y": 224,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "23c06925.0d2eb6",\r
-                "a5814717.4b953",\r
-                "39b144a2.fc3a7c"\r
+                "2dfd81e1.a251ae",\r
+                "bc1d9c19.8a817",\r
+                "d0adb7e4.435f98",\r
+                "bf30e0be.23b998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50cd8b4c.3fbe34",\r
+        "id": "4b515bec.7b07fc",\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<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2652,\r
-        "y": 843,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2636,\r
+        "y": 824,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f854478.eff1a4",\r
+        "id": "1fb3da4d.f9823e",\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": 2653,\r
-        "y": 898,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2637,\r
+        "y": 879,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78e29884.225c08",\r
+        "id": "1fed210d.6adb97",\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": 2275,\r
-        "y": 294,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2259,\r
+        "y": 275,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e80669a1.e9e15",\r
-                "2a720603.9816ea",\r
-                "13ab43c3.0c3b8c"\r
+                "1d390c60.f37264",\r
+                "828d1344.2eeb18",\r
+                "35c0fff4.63034"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e80669a1.e9e15",\r
+        "id": "1d390c60.f37264",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2491,\r
-        "y": 361,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2475,\r
+        "y": 342,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "14dca185.e1b46e"\r
+                "1dfc0585.305702"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a720603.9816ea",\r
+        "id": "828d1344.2eeb18",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2491.490966796875,\r
-        "y": 260.573974609375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2475.490966796875,\r
+        "y": 241.573974609375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e741b978.cc2c38"\r
+                "899f4256.fc61"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13ab43c3.0c3b8c",\r
+        "id": "35c0fff4.63034",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2487,\r
-        "y": 310,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2471,\r
+        "y": 291,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "b16bf403.baad58"\r
+                "5b10d117.cfe6d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e741b978.cc2c38",\r
+        "id": "899f4256.fc61",\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": 2669.0625,\r
-        "y": 260.8597412109375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2653.0625,\r
+        "y": 241.8597412109375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b16bf403.baad58",\r
+        "id": "5b10d117.cfe6d8",\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": 2669,\r
-        "y": 310,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2653,\r
+        "y": 291,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e843ab.3582ec4",\r
+        "id": "e459bf6d.9da9d8",\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": 2010,\r
-        "y": 783,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1994,\r
+        "y": 764,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4070a4d0.4176d4",\r
-                "60c71e39.2f942",\r
-                "a6a55952.b90f"\r
+                "f5d3816e.ab2828",\r
+                "4956f23f.0bb47c",\r
+                "fe0f59f6.d97868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4070a4d0.4176d4",\r
+        "id": "f5d3816e.ab2828",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2301.490966796875,\r
-        "y": 761.573974609375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2285.490966796875,\r
+        "y": 742.573974609375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "77c211be.bc11e8"\r
+                "9822556a.f611a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60c71e39.2f942",\r
+        "id": "4956f23f.0bb47c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2290,\r
-        "y": 806,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2274,\r
+        "y": 787,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "fbd7810f.a3734"\r
+                "6c100a4d.9d821c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77c211be.bc11e8",\r
+        "id": "9822556a.f611a",\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": 2450.0625,\r
-        "y": 761.8597412109375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2434.0625,\r
+        "y": 742.8597412109375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fbd7810f.a3734",\r
+        "id": "6c100a4d.9d821c",\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": 2449,\r
-        "y": 806,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2433,\r
+        "y": 787,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6a55952.b90f",\r
+        "id": "fe0f59f6.d97868",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2297,\r
-        "y": 885,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2281,\r
+        "y": 866,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "22d259e0.d6e2e6"\r
+                "6d1afb47.ab3814"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22d259e0.d6e2e6",\r
+        "id": "6d1afb47.ab3814",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2436,\r
-        "y": 885,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2420,\r
+        "y": 866,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\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
-                "84749d0f.3038c8",\r
-                "21292318.735edc",\r
-                "ce066c5d.e7734",\r
-                "e927f664.5c872",\r
-                "29397b6c.248454",\r
-                "c19c2198.0de5c",\r
-                "488403ee.0379ac"\r
+                "4b515bec.7b07fc",\r
+                "1fb3da4d.f9823e",\r
+                "97eccb48.84f6c",\r
+                "c57ab47a.d333d8",\r
+                "10cbf4f3.49fe3b",\r
+                "49d3005f.62282",\r
+                "15e0419f.a2cb36",\r
+                "e6402796.6c8a4",\r
+                "1f03402a.5db7",\r
+                "56710693.e24068",\r
+                "84b0870f.4db1e",\r
+                "3323f682.f60c3a",\r
+                "13ac3dbd.1f366a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14a4c097.be654f",\r
+        "id": "97eccb48.84f6c",\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": 2665,\r
-        "y": 966,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2649,\r
+        "y": 947,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "7df96ca0.99ecc4",\r
-                "50b0a0cb.3236a8",\r
-                "a3437ac7.e0ee1"\r
+                "8c8a4891.ac867",\r
+                "8506ad3d.b7e4c",\r
+                "a3b6635c.c539f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "644a5f8e.b0774",\r
+        "id": "c57ab47a.d333d8",\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": 2644,\r
-        "y": 1567.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2628,\r
+        "y": 1548.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "ece670c3.4f34a8",\r
-                "263c76fe.5b3242",\r
-                "97139121.0331f8"\r
+                "506562cd.b8f74c",\r
+                "8d73f82f.8988f8",\r
+                "24728d1d.df92ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7df96ca0.99ecc4",\r
+        "id": "8c8a4891.ac867",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2866,\r
-        "y": 850,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2850,\r
+        "y": 831,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "a6fc1138.23945"\r
+                "40f9d3c1.86e1ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50b0a0cb.3236a8",\r
+        "id": "8506ad3d.b7e4c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2861.509033203125,\r
-        "y": 899.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2845.509033203125,\r
+        "y": 880.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "6e6d0210.60f404"\r
+                "6f975963.47cb7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3437ac7.e0ee1",\r
+        "id": "a3b6635c.c539f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2865.509033203125,\r
-        "y": 950.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2849.509033203125,\r
+        "y": 931.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "d860cdb2.412c48"\r
+                "61bb235e.2775f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6fc1138.23945",\r
+        "id": "40f9d3c1.86e1ec",\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": 3014.571533203125,\r
-        "y": 849.2857666015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2998.571533203125,\r
+        "y": 830.2857666015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e6d0210.60f404",\r
+        "id": "6f975963.47cb7",\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": 3004.509033203125,\r
-        "y": 899.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2988.509033203125,\r
+        "y": 880.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ece670c3.4f34a8",\r
+        "id": "506562cd.b8f74c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2867,\r
-        "y": 1537.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2851,\r
+        "y": 1518.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f4c07ea8.414868"\r
+                "7f769faa.864248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "263c76fe.5b3242",\r
+        "id": "8d73f82f.8988f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2862.509033203125,\r
-        "y": 1587.4259033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2846.509033203125,\r
+        "y": 1568.4259033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "ce13d349.caf3b8"\r
+                "cc9ee8f2.77fda8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97139121.0331f8",\r
+        "id": "24728d1d.df92ba",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2866.509033203125,\r
-        "y": 1638.4259033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2850.509033203125,\r
+        "y": 1619.4259033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "d30e3d8d.09cef8"\r
+                "8a29f509.d58fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4c07ea8.414868",\r
+        "id": "7f769faa.864248",\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": 3015.571533203125,\r
-        "y": 1537.28564453125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2999.571533203125,\r
+        "y": 1518.28564453125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce13d349.caf3b8",\r
+        "id": "cc9ee8f2.77fda8",\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": 3005.509033203125,\r
-        "y": 1587.4259033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2989.509033203125,\r
+        "y": 1568.4259033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e31af50c.926d2",\r
+        "id": "b720785b.7c7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3679.66650390625,\r
-        "y": 994,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3663.66650390625,\r
+        "y": 975,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c203b1ea.86f6c",\r
-                "d4cb3bd3.a349c8",\r
-                "5d25d92f.6f798",\r
-                "a5aee8f6.ab5e58",\r
-                "c830d981.aee038"\r
+                "f3775fbc.163688",\r
+                "77e2870c.e28a38",\r
+                "ac8bf04e.ff247",\r
+                "7c2c78d5.f4945",\r
+                "bb95643a.1dafd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7824d8a.d2e4f8",\r
+        "id": "669f51ab.4dcf7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3507,\r
-        "y": 995,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3491,\r
+        "y": 976,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e31af50c.926d2"\r
+                "b720785b.7c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d5b9681.b7598",\r
+        "id": "bfa60b88.954ac8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3516.490966796875,\r
-        "y": 1037.5740356445312,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3500.490966796875,\r
+        "y": 1018.5740356445312,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4fc1bcc7.eeb784"\r
+                "f78f70ff.0f2c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e8be76c.59d528",\r
+        "id": "83a912b8.5c33b",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3505,\r
-        "y": 1084,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3489,\r
+        "y": 1065,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "ac4a57cf.bef8e8"\r
+                "d7142401.9476c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fc1bcc7.eeb784",\r
+        "id": "f78f70ff.0f2c38",\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": 3670.0623779296875,\r
-        "y": 1040.8597717285156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3654.0623779296875,\r
+        "y": 1021.8597717285156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac4a57cf.bef8e8",\r
+        "id": "d7142401.9476c",\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": 3674,\r
-        "y": 1085,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3658,\r
+        "y": 1066,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d860cdb2.412c48",\r
+        "id": "61bb235e.2775f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3027,\r
-        "y": 952,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3011,\r
+        "y": 933,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "62113903.77ec78",\r
-                "c9fe9947.c06348"\r
+                "4914fb6.031ad84",\r
+                "4835023e.e8e8cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d30e3d8d.09cef8",\r
+        "id": "8a29f509.d58fe8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3017,\r
-        "y": 1639.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3001,\r
+        "y": 1620.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4ecc6dae.def654",\r
-                "669a0eda.d8f578"\r
+                "33a198b5.ec1ae",\r
+                "684cf1ab.a79f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1006da4.a872e",\r
+        "id": "d9ace0a0.b4a76",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3647.66650390625,\r
-        "y": 1830,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3631.66650390625,\r
+        "y": 1811,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "a3aca2eb.21f5a8",\r
-                "d3723bfd.d9b168",\r
-                "d3c0c42f.4b437",\r
-                "2512774e.7c83b8",\r
-                "d281a70f.336618"\r
+                "a2003991.03fd4",\r
+                "52dfb8b2.652278",\r
+                "22f952b9.882086",\r
+                "eb4dde28.2b2138",\r
+                "60f3b421.08732c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dbe459.2e8d58",\r
+        "id": "cc45c64e.73066",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3475,\r
-        "y": 1831,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3459,\r
+        "y": 1812,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "a1006da4.a872e"\r
+                "d9ace0a0.b4a76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dab2f9a8.cea26",\r
+        "id": "33759aa.996c566",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3484.490966796875,\r
-        "y": 1873.5740356445312,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3468.490966796875,\r
+        "y": 1854.5740356445312,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "6f793776.f883f"\r
+                "28b2902a.f0c46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5d094cc.fe5d68",\r
+        "id": "fff61c46.59cf58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3473,\r
-        "y": 1920,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3457,\r
+        "y": 1901,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f383fe68.3b83"\r
+                "c4e6ae73.bdead"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f793776.f883f",\r
+        "id": "28b2902a.f0c46",\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": 3638.0623779296875,\r
-        "y": 1876.8597717285156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3622.0623779296875,\r
+        "y": 1857.8597717285156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f383fe68.3b83",\r
+        "id": "c4e6ae73.bdead",\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": 3642,\r
-        "y": 1921,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3626,\r
+        "y": 1902,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c203b1ea.86f6c",\r
+        "id": "f3775fbc.163688",\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": 3944,\r
-        "y": 978,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3928,\r
+        "y": 959,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "6fb08f41.de4d4",\r
-                "183e3f66.48a0d1"\r
+                "17df8b10.734cad",\r
+                "e9e72181.7c2d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "183e3f66.48a0d1",\r
+        "id": "e9e72181.7c2d78",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4167,\r
-        "y": 933,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4151,\r
+        "y": 914,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e55834d1.3ca1b8"\r
+                "c8b8d5f9.b22ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fb08f41.de4d4",\r
+        "id": "17df8b10.734cad",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4169,\r
-        "y": 997,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4153,\r
+        "y": 978,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f45e344f.88a748"\r
+                "59177303.95ce1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5bf466f.7bcdb98",\r
+        "id": "e95ea736.29045",\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": 4502,\r
-        "y": 888,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4486,\r
+        "y": 869,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f45e344f.88a748",\r
+        "id": "59177303.95ce1c",\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": 4331,\r
-        "y": 993,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4315,\r
+        "y": 974,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e55834d1.3ca1b8",\r
+        "id": "c8b8d5f9.b22ca8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4332,\r
-        "y": 930,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4316,\r
+        "y": 911,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "194d0d3d.11557b",\r
-                "5bf466f.7bcdb98"\r
+                "f09148e0.5a878",\r
+                "e95ea736.29045"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "194d0d3d.11557b",\r
+        "id": "f09148e0.5a878",\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": 4503,\r
-        "y": 996,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4487,\r
+        "y": 977,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd1a9ea9.6d631",\r
+        "id": "2c408fec.1a81a",\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": 4504,\r
-        "y": 945,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4488,\r
+        "y": 926,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d25d92f.6f798",\r
+        "id": "ac8bf04e.ff247",\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='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$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": 3946,\r
-        "y": 1137,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3930,\r
+        "y": 1118,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d4cb3bd3.a349c8",\r
+        "id": "77e2870c.e28a38",\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": 3991,\r
-        "y": 1047,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3975,\r
+        "y": 1028,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6324b9d6.c58fe",\r
+        "id": "936488c4.d6b8e",\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": 3880,\r
-        "y": 1088,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3864,\r
+        "y": 1069,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3aca2eb.21f5a8",\r
+        "id": "a2003991.03fd4",\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": 3934,\r
-        "y": 1834.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3918,\r
+        "y": 1815.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "37186f70.3d57",\r
-                "4ffb9846.2cd768"\r
+                "f2d8cb03.1eed48",\r
+                "6e32cf18.31944"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ffb9846.2cd768",\r
+        "id": "6e32cf18.31944",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4157,\r
-        "y": 1789.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4141,\r
+        "y": 1770.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "17371f4a.955d61"\r
+                "201ffc86.8db20c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37186f70.3d57",\r
+        "id": "f2d8cb03.1eed48",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4159,\r
-        "y": 1853.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4143,\r
+        "y": 1834.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "1981566c.49d212"\r
+                "b29b2d4c.c3046"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17f707eb.a2a908",\r
+        "id": "2386e717.060b18",\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": 4492,\r
-        "y": 1747.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4476,\r
+        "y": 1728.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1981566c.49d212",\r
+        "id": "b29b2d4c.c3046",\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": 4318,\r
-        "y": 1872.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4302,\r
+        "y": 1853.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17371f4a.955d61",\r
+        "id": "201ffc86.8db20c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4322,\r
-        "y": 1786.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4306,\r
+        "y": 1767.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "17f707eb.a2a908",\r
-                "ca2d1022.cf4e88"\r
+                "2386e717.060b18",\r
+                "c71df80d.cfbb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca2d1022.cf4e88",\r
+        "id": "c71df80d.cfbb08",\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": 4493,\r
-        "y": 1852.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4477,\r
+        "y": 1833.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cfd8f17.95a8e",\r
+        "id": "e385afea.eec45",\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": 4488,\r
-        "y": 1801.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4472,\r
+        "y": 1782.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3c0c42f.4b437",\r
+        "id": "22f952b9.882086",\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='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$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": 3936,\r
-        "y": 1993.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3920,\r
+        "y": 1974.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d3723bfd.d9b168",\r
+        "id": "52dfb8b2.652278",\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": 3981,\r
-        "y": 1903.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3965,\r
+        "y": 1884.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1765f0ec.e922ff",\r
+        "id": "4961c905.9d4bb",\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": 3870,\r
-        "y": 1941.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3854,\r
+        "y": 1922.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "79e86730.1965c8",\r
+        "id": "10cbf4f3.49fe3b",\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": 2845,\r
-        "y": 2068,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2848,\r
+        "y": 2278,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4f1b84d7.aafb5c",\r
+        "id": "49d3005f.62282",\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": 2639,\r
-        "y": 1969,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2642,\r
+        "y": 2179,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3db83432.384b6c",\r
+        "id": "9f05df83.0d8378",\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": 2613,\r
-        "y": 1922,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2616,\r
+        "y": 2132,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ca2c5af.473d34",\r
+        "id": "65916227.3c1154",\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.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\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": 2721,\r
-        "y": 2227,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2796,\r
+        "y": 2831,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "57191dce.959cfc"\r
+                "17bd32c6.c38a7d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28a40435.4178ec",\r
+        "id": "fa5ee7b8.d80d3",\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": 2724.5,\r
-        "y": 2297,\r
-        "z": "4d37a11.42c136",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\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": 3372.5,\r
-        "y": 2216,\r
-        "z": "4d37a11.42c136",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\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": 3374.5,\r
-        "y": 2255,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2787.5,\r
+        "y": 2880,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a5aee8f6.ab5e58",\r
+        "id": "7c2c78d5.f4945",\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": 4074,\r
-        "y": 1185,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4058,\r
+        "y": 1166,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2512774e.7c83b8",\r
+        "id": "eb4dde28.2b2138",\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": 4063,\r
-        "y": 2058.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4047,\r
+        "y": 2039.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57191dce.959cfc",\r
+        "id": "17bd32c6.c38a7d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3021,\r
-        "y": 2234,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3082,\r
+        "y": 2838,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "dcb72301.82c018"\r
+                "20a19a36.cfd0d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcb72301.82c018",\r
+        "id": "20a19a36.cfd0d6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3161.500244140625,\r
-        "y": 2235.25390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3222.500244140625,\r
+        "y": 2839.25390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6975c99d.325498",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME: do we need this relationship?",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 3409,\r
-        "y": 2175,\r
-        "z": "4d37a11.42c136",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "e85b69e.5211998",\r
+        "id": "dba0a851.2f60f8",\r
         "type": "comment",\r
         "name": "TODO: FIXME: put proper values",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2688,\r
-        "y": 2187,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2718,\r
+        "y": 2777,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b46ca414.99697",\r
+        "id": "cb2d65a2.90a53",\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.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\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": 2724,\r
-        "y": 2515,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2786,\r
+        "y": 3121,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e64b3d38.e980a"\r
+                "a71dc667.1e8b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58f4ff2f.89d75",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME: do we need this relationship?",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 3412,\r
-        "y": 2455,\r
-        "z": "4d37a11.42c136",\r
-        "wires": []\r
-    },\r
-    {\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": 3375.5,\r
-        "y": 2496,\r
-        "z": "4d37a11.42c136",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\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": 3377.5,\r
-        "y": 2535,\r
-        "z": "4d37a11.42c136",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "d0ea482.a9901b8",\r
+        "id": "c245f255.688bf",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3164.500244140625,\r
-        "y": 2515.25390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3226.500244140625,\r
+        "y": 3121.25390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e64b3d38.e980a",\r
+        "id": "a71dc667.1e8b48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3024,\r
-        "y": 2514,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3086,\r
+        "y": 3120,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "d0ea482.a9901b8"\r
+                "c245f255.688bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cd3d1db.fb7ce8",\r
+        "id": "86719a40.1873b8",\r
         "type": "comment",\r
         "name": "TODO: FIXME: put proper values",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2704,\r
-        "y": 2475,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2712,\r
+        "y": 3073,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57fdafb2.9eec08",\r
+        "id": "ca75e77c.cd7028",\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": 2722.5,\r
-        "y": 2555,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2784.5,\r
+        "y": 3161,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aa4b663b.c9d06",\r
+        "id": "a23bd528.d58958",\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": 2596,\r
-        "y": 2638,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2593,\r
+        "y": 3241,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc2a7bf0.e878b",\r
+        "id": "15e0419f.a2cb36",\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='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\n\n<parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].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<parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\n\n<!--otn-tunnel-slice-list[$idx]-->\n\n",\r
         "comments": "",\r
-        "x": 2661,\r
-        "y": 2683,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2658,\r
+        "y": 3286,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c916faf.da498",\r
+        "id": "2d08c6.2cc1e73a",\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": 5118,\r
-        "y": 705,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5102,\r
+        "y": 686,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "883ac008.74f89",\r
-                "6cf958ca.c3e4a8",\r
-                "e70b241a.97d7e8"\r
+                "fe7f5526.b757d",\r
+                "ace94fc7.113e6",\r
+                "42739782.dc6168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14dca185.e1b46e",\r
+        "id": "1dfc0585.305702",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2671,\r
-        "y": 361,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2655,\r
+        "y": 342,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "8a257359.8a7208"\r
+                "8622621b.5191"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1ac55d9.d865b8",\r
+        "id": "7de95d04.4c5e84",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1601.0001220703125,\r
-        "y": 778.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1585.0001220703125,\r
+        "y": 759.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f6ec4c40.65362"\r
+                "38efe599.5c2462"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14b8fde.fcc1702",\r
+        "id": "a0ff94f7.a05cd8",\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": 2339,\r
-        "y": 484,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2323,\r
+        "y": 465,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e65ebebd.579d6",\r
-                "32fc4868.fa2b8"\r
+                "8055d128.93cf8",\r
+                "a4e55956.340f1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32fc4868.fa2b8",\r
+        "id": "a4e55956.340f1",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2649,\r
-        "y": 491,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2633,\r
+        "y": 472,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e65ebebd.579d6",\r
+        "id": "8055d128.93cf8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2648,\r
-        "y": 545,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2632,\r
+        "y": 526,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c14b8719.903d8"\r
+                "33bd7ebe.34c502"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "badc6972.d68008",\r
+        "id": "2ecd1033.1e79d8",\r
         "type": "set",\r
         "name": "set the current logical-link-name",\r
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2021,\r
-        "y": 728,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2005,\r
+        "y": 709,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6ec4c40.65362",\r
+        "id": "38efe599.5c2462",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1778,\r
-        "y": 771,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1762,\r
+        "y": 752,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "badc6972.d68008",\r
-                "6e843ab.3582ec4"\r
+                "2ecd1033.1e79d8",\r
+                "e459bf6d.9da9d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76aa64b6.332a54",\r
+        "id": "f61b9c.2378ec68",\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": 3207,\r
-        "y": 957,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3191,\r
+        "y": 938,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62113903.77ec78",\r
+        "id": "4914fb6.031ad84",\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": 3250,\r
-        "y": 1022,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3234,\r
+        "y": 1003,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "b7824d8a.d2e4f8",\r
-                "5d5b9681.b7598",\r
-                "6e8be76c.59d528"\r
+                "669f51ab.4dcf7",\r
+                "bfa60b88.954ac8",\r
+                "83a912b8.5c33b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ecc6dae.def654",\r
+        "id": "33a198b5.ec1ae",\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": 3247,\r
-        "y": 1866,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3231,\r
+        "y": 1847,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c9dbe459.2e8d58",\r
-                "dab2f9a8.cea26",\r
-                "f5d094cc.fe5d68"\r
+                "cc45c64e.73066",\r
+                "33759aa.996c566",\r
+                "fff61c46.59cf58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f6e53ed.b087ec",\r
+        "id": "13eb2671.9e12f2",\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": 3208,\r
-        "y": 1810,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3192,\r
+        "y": 1791,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8a257359.8a7208",\r
+        "id": "8622621b.5191",\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": 2964,\r
-        "y": 308,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2948,\r
+        "y": 289,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "8ea1434f.746858",\r
-                "f2d8ff7.3c8d5",\r
-                "a6d32e01.02e81"\r
+                "774c27b3.d5b958",\r
+                "314f18ee.d0e28",\r
+                "177a6858.e45f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2d8ff7.3c8d5",\r
+        "id": "314f18ee.d0e28",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3237.490966796875,\r
-        "y": 200.573974609375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3221.490966796875,\r
+        "y": 181.573974609375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "b85ff289.1649f"\r
+                "bf0d979c.0d6a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b85ff289.1649f",\r
+        "id": "bf0d979c.0d6a2",\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": 3415.0625,\r
-        "y": 200.8597412109375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3399.0625,\r
+        "y": 181.8597412109375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6d32e01.02e81",\r
+        "id": "177a6858.e45f48",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3233,\r
-        "y": 250,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3217,\r
+        "y": 231,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "381f7f5a.80d3f8"\r
+                "69e0c103.73f7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "381f7f5a.80d3f8",\r
+        "id": "69e0c103.73f7e",\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": 3415,\r
-        "y": 250,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3399,\r
+        "y": 231,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ea1434f.746858",\r
+        "id": "774c27b3.d5b958",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3237,\r
-        "y": 301,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3221,\r
+        "y": 282,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "6ca45b0b.848dec"\r
+                "8d4f11e6.7da04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ca45b0b.848dec",\r
+        "id": "8d4f11e6.7da04",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3417,\r
-        "y": 301,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3401,\r
+        "y": 282,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "14b8fde.fcc1702"\r
+                "a0ff94f7.a05cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40603cb7.607bc4",\r
+        "id": "fe8ff063.6863b8",\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": 2908,\r
-        "y": 525,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2892,\r
+        "y": 506,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4e667cbe.69222c"\r
+                "7f3884a8.055b2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e667cbe.69222c",\r
+        "id": "7f3884a8.055b2c",\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": 3188,\r
-        "y": 525,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3172,\r
+        "y": 506,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e1ac55d9.d865b8"\r
+                "7de95d04.4c5e84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13452ae4.22e4ad",\r
+        "id": "5050eb58.e00ed4",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3393,\r
-        "y": 499,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3377,\r
+        "y": 480,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "245f45af.4ae9da"\r
+                "9ce29b77.ad6fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "245f45af.4ae9da",\r
+        "id": "9ce29b77.ad6fe8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3569.9998779296875,\r
-        "y": 491.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3553.9998779296875,\r
+        "y": 472.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "868607a4.e796b",\r
-                "3bdb9c7c.d6977c"\r
+                "e7ee0b09.87c5d8",\r
+                "7fe89152.e612e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "868607a4.e796b",\r
+        "id": "e7ee0b09.87c5d8",\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": 3812.9998779296875,\r
-        "y": 448.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3796.9998779296875,\r
+        "y": 429.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3bdb9c7c.d6977c",\r
+        "id": "7fe89152.e612e8",\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": 3801.9998779296875,\r
-        "y": 503.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3785.9998779296875,\r
+        "y": 484.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "11d90691.38b7b1",\r
-                "e5aaddec.aca59",\r
-                "6698da7a.77b3bc"\r
+                "64fb2208.a0a974",\r
+                "c3b9f4d3.aab1b8",\r
+                "f6aa84f.18621f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6698da7a.77b3bc",\r
+        "id": "f6aa84f.18621f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4055,\r
-        "y": 390,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4039,\r
+        "y": 371,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e904e6fc.1061a"\r
+                "c20366f5.78311"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e904e6fc.1061a",\r
+        "id": "c20366f5.78311",\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": 4203.571533203125,\r
-        "y": 390.2857666015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4187.571533203125,\r
+        "y": 371.2857666015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4975bc8f.93ecdc",\r
+        "id": "a9aadb9.f22de28",\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": 4202.509033203125,\r
-        "y": 434.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4186.509033203125,\r
+        "y": 415.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5aaddec.aca59",\r
+        "id": "c3b9f4d3.aab1b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4043.509033203125,\r
-        "y": 434.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4027.509033203125,\r
+        "y": 415.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4975bc8f.93ecdc"\r
+                "a9aadb9.f22de28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11d90691.38b7b1",\r
+        "id": "64fb2208.a0a974",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4050.509033203125,\r
-        "y": 513.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4034.509033203125,\r
+        "y": 494.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "3b14af19.ae1128"\r
+                "7a83723d.cc96f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b14af19.ae1128",\r
+        "id": "7a83723d.cc96f4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4189.509033203125,\r
-        "y": 513.426025390625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4173.509033203125,\r
+        "y": 494.426025390625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "70ed97b5.dc1c9",\r
-                "c2e43483.a12bd"\r
+                "1f8d33e3.a771dc",\r
+                "420f3616.2f701"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70ed97b5.dc1c9",\r
+        "id": "1f8d33e3.a771dc",\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": 4395,\r
-        "y": 511,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4379,\r
+        "y": 492,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9fe9947.c06348",\r
+        "id": "4835023e.e8e8cc",\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": 3251,\r
-        "y": 692,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3235,\r
+        "y": 673,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "78baed3e.c501f4",\r
-                "120f1ac.ca76ae5"\r
+                "eafc912d.cb0fe",\r
+                "14b2df73.02d4e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "120f1ac.ca76ae5",\r
+        "id": "14b2df73.02d4e1",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3474,\r
-        "y": 678,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3458,\r
+        "y": 659,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "40ab4c81.445cd4"\r
+                "bb352d17.34137"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78baed3e.c501f4",\r
+        "id": "eafc912d.cb0fe",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3476,\r
-        "y": 711,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3460,\r
+        "y": 692,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "9d068c67.4598d"\r
+                "4040c9e2.8e3008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d068c67.4598d",\r
+        "id": "4040c9e2.8e3008",\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": 3619,\r
-        "y": 708,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3603,\r
+        "y": 689,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40ab4c81.445cd4",\r
+        "id": "bb352d17.34137",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3622,\r
-        "y": 671,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3606,\r
+        "y": 652,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e718de2c.ab002",\r
-                "68fbd6c1.ad0448"\r
+                "8f0d5ee9.6635d",\r
+                "300f312a.b253d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e718de2c.ab002",\r
+        "id": "8f0d5ee9.6635d",\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": 3784,\r
-        "y": 666,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3768,\r
+        "y": 647,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "669a0eda.d8f578",\r
+        "id": "684cf1ab.a79f48",\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": 3265,\r
-        "y": 1528.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3249,\r
+        "y": 1509.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "3eeffc60.cab244",\r
-                "163d6add.444455"\r
+                "10ff0da4.16d4ea",\r
+                "55c5195b.3875c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "163d6add.444455",\r
+        "id": "55c5195b.3875c8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3488,\r
-        "y": 1514.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3472,\r
+        "y": 1495.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "2e1531f5.2b244e"\r
+                "7202d26b.6dffec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3eeffc60.cab244",\r
+        "id": "10ff0da4.16d4ea",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3490,\r
-        "y": 1547.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3474,\r
+        "y": 1528.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "bb0d91d9.020e4"\r
+                "30474e74.e5639a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb0d91d9.020e4",\r
+        "id": "30474e74.e5639a",\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": 3633,\r
-        "y": 1544.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3617,\r
+        "y": 1525.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e1531f5.2b244e",\r
+        "id": "7202d26b.6dffec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3636,\r
-        "y": 1507.9998779296875,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3620,\r
+        "y": 1488.9998779296875,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "dd9519ef.d4213",\r
-                "54817df4.67d484"\r
+                "885f2609.7cba58",\r
+                "e1d06713.adb0c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd9519ef.d4213",\r
+        "id": "885f2609.7cba58",\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": 3830,\r
-        "y": 1511,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3814,\r
+        "y": 1492,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac58016f.1c2c1",\r
+        "id": "d352d101.d008a8",\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": 1094,\r
-        "y": 216,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1078,\r
+        "y": 197,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "260f00b5.585908",\r
+        "id": "5f8f79a5.68d88",\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": 2727,\r
-        "y": 2149,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2771,\r
+        "y": 2745,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "134248ca.e0fa77",\r
+        "id": "9fa3320.fe9395",\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": 2725,\r
-        "y": 2437,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2764,\r
+        "y": 3038,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c830d981.aee038",\r
+        "id": "bb95643a.1dafd8",\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": 3898,\r
-        "y": 1262,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3882,\r
+        "y": 1243,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4f78d00a.39ba68"\r
+                "232e8f32.739b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f78d00a.39ba68",\r
+        "id": "232e8f32.739b48",\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": 4104,\r
-        "y": 1262,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4088,\r
+        "y": 1243,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "489cbbcb.77186c"\r
+                "8bbe738e.7fafb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "489cbbcb.77186c",\r
+        "id": "8bbe738e.7fafb",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4319.28564453125,\r
-        "y": 1261.82177734375,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4303.28564453125,\r
+        "y": 1242.82177734375,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "3bbad5a.8ec85aa"\r
+                "c3ad3464.e3237"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bbad5a.8ec85aa",\r
+        "id": "c3ad3464.e3237",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4526.1171875,\r
-        "y": 1262.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4510.1171875,\r
+        "y": 1243.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "cf0eeee3.8d6188",\r
-                "80da6c7c.bf9bc",\r
-                "4327bba4.ea16c4"\r
+                "f0158859.e44c4",\r
+                "1be7b379.0a0a35",\r
+                "bee0e07a.660808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf0eeee3.8d6188",\r
+        "id": "f0158859.e44c4",\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": 4741.1171875,\r
-        "y": 1224.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4725.1171875,\r
+        "y": 1205.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80da6c7c.bf9bc",\r
+        "id": "1be7b379.0a0a35",\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": 4738.1171875,\r
-        "y": 1263.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4722.1171875,\r
+        "y": 1244.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "54d57ef.0aa16"\r
+                "5d7ec3ca.e9fe2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4327bba4.ea16c4",\r
+        "id": "bee0e07a.660808",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4693.6171875,\r
-        "y": 1305.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4677.6171875,\r
+        "y": 1286.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54d57ef.0aa16",\r
+        "id": "5d7ec3ca.e9fe2c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4918.6171875,\r
-        "y": 1262.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4902.6171875,\r
+        "y": 1243.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "136083ca.f8ed24"\r
+                "5c631dd4.8f5fbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "136083ca.f8ed24",\r
+        "id": "5c631dd4.8f5fbc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5076.6171875,\r
-        "y": 1262.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5060.6171875,\r
+        "y": 1243.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "43a5fa3.d0c2504"\r
+                "d5d5e908.7a8eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43a5fa3.d0c2504",\r
+        "id": "d5d5e908.7a8eb8",\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": 5283.6171875,\r
-        "y": 1262.34033203125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5267.6171875,\r
+        "y": 1243.34033203125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d281a70f.336618",\r
+        "id": "60f3b421.08732c",\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": 3895,\r
-        "y": 2131.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3879,\r
+        "y": 2112.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "21553f06.14bad"\r
+                "715a89d.cfea178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21553f06.14bad",\r
+        "id": "715a89d.cfea178",\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": 4101,\r
-        "y": 2131.0001220703125,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4085,\r
+        "y": 2112.0001220703125,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "d5a45fe2.8cbaf"\r
+                "977e3712.429b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5a45fe2.8cbaf",\r
+        "id": "977e3712.429b18",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4316.28564453125,\r
-        "y": 2130.8218994140625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4300.28564453125,\r
+        "y": 2111.8218994140625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "3432450f.73fd1a"\r
+                "2113d9ff.cdd31e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3432450f.73fd1a",\r
+        "id": "2113d9ff.cdd31e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4523.1171875,\r
-        "y": 2131.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4507.1171875,\r
+        "y": 2112.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4d1b045c.8befb4",\r
-                "ff4bcdcd.b592",\r
-                "82369db7.8fbd4"\r
+                "3c92c59b.613ca2",\r
+                "193b4238.409d8e",\r
+                "b71c718.f135e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d1b045c.8befb4",\r
+        "id": "3c92c59b.613ca2",\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": 4738.1171875,\r
-        "y": 2093.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4722.1171875,\r
+        "y": 2074.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff4bcdcd.b592",\r
+        "id": "193b4238.409d8e",\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": 4735.1171875,\r
-        "y": 2132.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4719.1171875,\r
+        "y": 2113.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "a8f23d1f.d221e8"\r
+                "df85928.81de67"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82369db7.8fbd4",\r
+        "id": "b71c718.f135e1",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4690.6171875,\r
-        "y": 2174.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4674.6171875,\r
+        "y": 2155.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8f23d1f.d221e8",\r
+        "id": "df85928.81de67",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4915.6171875,\r
-        "y": 2131.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4899.6171875,\r
+        "y": 2112.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "403d184.8f53468"\r
+                "8b1f9fde.337d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "403d184.8f53468",\r
+        "id": "8b1f9fde.337d98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5073.6171875,\r
-        "y": 2131.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5057.6171875,\r
+        "y": 2112.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c7d0f697.2aea68"\r
+                "20d9b129.b72206"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7d0f697.2aea68",\r
+        "id": "20d9b129.b72206",\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": 5280.6171875,\r
-        "y": 2131.3404541015625,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5264.6171875,\r
+        "y": 2112.3404541015625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "84749d0f.3038c8",\r
+        "id": "e6402796.6c8a4",\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=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='src-ttp-id' value='`$domain-B.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\n<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",\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=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='src-ttp-id' value='`$domain-B.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<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",\r
         "comments": "",\r
-        "x": 2656,\r
-        "y": 3058,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2653,\r
+        "y": 3661,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "68fbd6c1.ad0448",\r
+        "id": "300f312a.b253d6",\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": 3811,\r
-        "y": 738,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3795,\r
+        "y": 719,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "69417d44.afb3fc",\r
-                "a15ac77e.798db8",\r
-                "3a89038d.704134"\r
+                "1c354309.a76ffd",\r
+                "950deba8.cc3e4",\r
+                "c2c16051.a906d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69417d44.afb3fc",\r
+        "id": "1c354309.a76ffd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4006.5001220703125,\r
-        "y": 690,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3990.5001220703125,\r
+        "y": 671,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "138b37c3.968d8"\r
+                "d41af0c3.594838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a15ac77e.798db8",\r
+        "id": "950deba8.cc3e4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3998.5001220703125,\r
-        "y": 745,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3982.5001220703125,\r
+        "y": 726,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "5742f10e.dadab8"\r
+                "3d15fff1.053cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a89038d.704134",\r
+        "id": "c2c16051.a906d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4003.5001220703125,\r
-        "y": 802,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3987.5001220703125,\r
+        "y": 783,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "56dfcb3e.f8e3ac"\r
+                "d7ef8f23.d036"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56dfcb3e.f8e3ac",\r
+        "id": "d7ef8f23.d036",\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": 4155.5001220703125,\r
-        "y": 803,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4139.5001220703125,\r
+        "y": 784,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5742f10e.dadab8",\r
+        "id": "3d15fff1.053cf",\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": 4166.5001220703125,\r
-        "y": 748,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4150.5001220703125,\r
+        "y": 729,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "138b37c3.968d8",\r
+        "id": "d41af0c3.594838",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4150.8824462890625,\r
-        "y": 687.6556701660156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4134.8824462890625,\r
+        "y": 668.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "b4d80ee.d93167"\r
+                "b45d0128.680c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40dc3d01.0cfddc",\r
+        "id": "7cb8afd4.8d20b8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4733,\r
-        "y": 706,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4717,\r
+        "y": 687,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "ce5ec787.25a25"\r
+                "47edc84c.808f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce5ec787.25a25",\r
+        "id": "47edc84c.808f88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4910,\r
-        "y": 698,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4894,\r
+        "y": 679,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "deda36.39eb45c8",\r
-                "2c916faf.da498"\r
+                "266ac25a.ea33a6",\r
+                "2d08c6.2cc1e73a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4d80ee.d93167",\r
+        "id": "b45d0128.680c8",\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": 4335,\r
-        "y": 702,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4319,\r
+        "y": 683,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "83a731e6.aee9d8"\r
+                "4f9ef890.59c338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83a731e6.aee9d8",\r
+        "id": "4f9ef890.59c338",\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": 4530,\r
-        "y": 702,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4514,\r
+        "y": 683,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "40dc3d01.0cfddc",\r
-                "556c2535.2cf6f4"\r
+                "7cb8afd4.8d20b8",\r
+                "212f425.c6d5fbe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "deda36.39eb45c8",\r
+        "id": "266ac25a.ea33a6",\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": 5148,\r
-        "y": 653,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5132,\r
+        "y": 634,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "883ac008.74f89",\r
+        "id": "fe7f5526.b757d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5328,\r
-        "y": 696,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5312,\r
+        "y": 677,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "5bb6445.b0cb1bc"\r
+                "c4631195.e5511"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cf958ca.c3e4a8",\r
+        "id": "ace94fc7.113e6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5320,\r
-        "y": 751,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5304,\r
+        "y": 732,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f6420bc8.c6108"\r
+                "af8bf071.82c85"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e70b241a.97d7e8",\r
+        "id": "42739782.dc6168",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5325,\r
-        "y": 808,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5309,\r
+        "y": 789,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e90b6e53.2dc61"\r
+                "b1e33e76.6db9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e90b6e53.2dc61",\r
+        "id": "b1e33e76.6db9b",\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": 5477,\r
-        "y": 809,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5461,\r
+        "y": 790,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6420bc8.c6108",\r
+        "id": "af8bf071.82c85",\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": 5488,\r
-        "y": 754,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5472,\r
+        "y": 735,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5bb6445.b0cb1bc",\r
+        "id": "c4631195.e5511",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5472.38232421875,\r
-        "y": 693.6556701660156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5456.38232421875,\r
+        "y": 674.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "36dcfa67.508606"\r
+                "4dcc9c46.887914"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36dcfa67.508606",\r
+        "id": "4dcc9c46.887914",\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": 5687,\r
-        "y": 690,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5671,\r
+        "y": 671,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54817df4.67d484",\r
+        "id": "e1d06713.adb0c8",\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": 3852,\r
-        "y": 1579,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3836,\r
+        "y": 1560,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "12332a8b.1f458d",\r
-                "e70d4463.7fed78",\r
-                "9e28dd86.32b368"\r
+                "34f7d7e6.e7fa8",\r
+                "cb710953.72942",\r
+                "4c788e8d.e93588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12332a8b.1f458d",\r
+        "id": "34f7d7e6.e7fa8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4047.5001220703125,\r
-        "y": 1531,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4031.5001220703125,\r
+        "y": 1512,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "97851436.c0f798"\r
+                "fd0d1ee5.65b0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e70d4463.7fed78",\r
+        "id": "cb710953.72942",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4039.5001220703125,\r
-        "y": 1586,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4023.5001220703125,\r
+        "y": 1567,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "9865196d.c10828"\r
+                "68639fde.fb4de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e28dd86.32b368",\r
+        "id": "4c788e8d.e93588",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4044.5001220703125,\r
-        "y": 1643,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4028.5001220703125,\r
+        "y": 1624,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "1636bf8.c7b9e41"\r
+                "ed57c904.1da5b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1636bf8.c7b9e41",\r
+        "id": "ed57c904.1da5b",\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": 4196.5001220703125,\r
-        "y": 1644,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4180.5001220703125,\r
+        "y": 1625,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9865196d.c10828",\r
+        "id": "68639fde.fb4de8",\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": 4207.5001220703125,\r
-        "y": 1589,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4191.5001220703125,\r
+        "y": 1570,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97851436.c0f798",\r
+        "id": "fd0d1ee5.65b0f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4191.8824462890625,\r
-        "y": 1528.6556701660156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4175.8824462890625,\r
+        "y": 1509.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "601870d2.2269c8"\r
+                "2c890085.25e4f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "358b8a93.9adabe",\r
+        "id": "b16b2c11.a7e9e",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4774,\r
-        "y": 1547,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4758,\r
+        "y": 1528,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f1454db6.8dcaf8"\r
+                "e2c7b2a2.534808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1454db6.8dcaf8",\r
+        "id": "e2c7b2a2.534808",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4951,\r
-        "y": 1539,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4935,\r
+        "y": 1520,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "1806e2c2.14485d",\r
-                "8cb20d6f.760bf"\r
+                "8256d13e.acb508",\r
+                "e33af2d.2ed629"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "601870d2.2269c8",\r
+        "id": "2c890085.25e4f8",\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": 4376,\r
-        "y": 1543,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4360,\r
+        "y": 1524,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "4732f224.c95254"\r
+                "7ad873b6.5b0624"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4732f224.c95254",\r
+        "id": "7ad873b6.5b0624",\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": 4571,\r
-        "y": 1543,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4555,\r
+        "y": 1524,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "358b8a93.9adabe",\r
-                "3beefc43.434434"\r
+                "b16b2c11.a7e9e",\r
+                "ba30acec.499f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cb20d6f.760bf",\r
+        "id": "e33af2d.2ed629",\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": 5159,\r
-        "y": 1546,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5143,\r
+        "y": 1527,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c4071110.82806",\r
-                "ce108d7.ad4977",\r
-                "c040099f.13bbf8"\r
+                "dd2f9c6b.57f548",\r
+                "3b879379.c9bf84",\r
+                "13b1398c.3c465e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1806e2c2.14485d",\r
+        "id": "8256d13e.acb508",\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": 5189,\r
-        "y": 1494,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5173,\r
+        "y": 1475,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4071110.82806",\r
+        "id": "dd2f9c6b.57f548",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5369,\r
-        "y": 1537,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5353,\r
+        "y": 1518,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "c3f3513e.3d36c"\r
+                "56d2c260.edc91c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce108d7.ad4977",\r
+        "id": "3b879379.c9bf84",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5361,\r
-        "y": 1592,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5345,\r
+        "y": 1573,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "98979539.818688"\r
+                "7449bea.eaa7fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c040099f.13bbf8",\r
+        "id": "13b1398c.3c465e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5366,\r
-        "y": 1649,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5350,\r
+        "y": 1630,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "45d3d695.c0cf2"\r
+                "232c7315.841b1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45d3d695.c0cf2",\r
+        "id": "232c7315.841b1c",\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": 5518,\r
-        "y": 1650,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5502,\r
+        "y": 1631,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98979539.818688",\r
+        "id": "7449bea.eaa7fc",\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": 5529,\r
-        "y": 1595,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5513,\r
+        "y": 1576,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3f3513e.3d36c",\r
+        "id": "56d2c260.edc91c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5513.38232421875,\r
-        "y": 1534.6556701660156,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5497.38232421875,\r
+        "y": 1515.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "90464df.06ab9b"\r
+                "49d0cb53.31a39c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90464df.06ab9b",\r
+        "id": "49d0cb53.31a39c",\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": 5728,\r
-        "y": 1531,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5712,\r
+        "y": 1512,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5814717.4b953",\r
+        "id": "4197c53b.8564cc",\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-sliceA-list-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": 1959,\r
-        "y": 2744,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2006,\r
+        "y": 4699,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "2242c3cc.13b1dc",\r
-                "2c8586d6.b70122"\r
+                "70c04755.d69dd8",\r
+                "d409404c.9b0598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c8586d6.b70122",\r
+        "id": "d409404c.9b0598",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2242,\r
-        "y": 2724,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2289,\r
+        "y": 4679,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "8e14b997.54e1b8"\r
+                "b37528b2.115b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2242c3cc.13b1dc",\r
+        "id": "70c04755.d69dd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2243.000213623047,\r
-        "y": 2774.99990940094,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2290.000213623047,\r
+        "y": 4729.99990940094,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "72bda37b.1b4f84"\r
+                "31bb8bbe.1ece2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e14b997.54e1b8",\r
+        "id": "b37528b2.115b48",\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": 2382.0002479553223,\r
-        "y": 2724.0000009536743,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2429.0002479553223,\r
+        "y": 4679.000000953674,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72bda37b.1b4f84",\r
+        "id": "31bb8bbe.1ece2c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2388.02725982666,\r
-        "y": 2772.745394706726,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2435.02725982666,\r
+        "y": 4727.745394706726,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "39b144a2.fc3a7c",\r
+        "id": "c751bc62.d2e9d8",\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-sliceB-list-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": 1959,\r
-        "y": 3110,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2002,\r
+        "y": 4868,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "23f4f16e.f2ab6e",\r
-                "8c667512.e5492"\r
+                "9cb98bdf.eb0c38",\r
+                "32bfa672.12903a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c667512.e5492",\r
+        "id": "32bfa672.12903a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2233,\r
-        "y": 3090,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2276,\r
+        "y": 4848,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "1089012f.df48c7"\r
+                "b28dd680.86b978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23f4f16e.f2ab6e",\r
+        "id": "9cb98bdf.eb0c38",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2234.000213623047,\r
-        "y": 3140.99990940094,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2277.000213623047,\r
+        "y": 4898.99990940094,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "199cfc4b.ed097c"\r
+                "2765f5a8.5ab652"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1089012f.df48c7",\r
+        "id": "b28dd680.86b978",\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": 2373.0002479553223,\r
-        "y": 3090.0000009536743,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2416.0002479553223,\r
+        "y": 4848.000000953674,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "199cfc4b.ed097c",\r
+        "id": "2765f5a8.5ab652",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2379.02725982666,\r
-        "y": 3138.745394706726,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2422.02725982666,\r
+        "y": 4896.745394706726,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c14b8719.903d8",\r
+        "id": "33bd7ebe.34c502",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2812,\r
-        "y": 471,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2796,\r
+        "y": 452,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "40603cb7.607bc4",\r
-                "7f3f76ad.e04ac8"\r
+                "fe8ff063.6863b8",\r
+                "4e85bccf.c8cf0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f3f76ad.e04ac8",\r
+        "id": "4e85bccf.c8cf0c",\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": 3093,\r
-        "y": 427,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3077,\r
+        "y": 408,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "31eeaed6.c9c2d2"\r
+                "badd7dbd.ce16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31eeaed6.c9c2d2",\r
+        "id": "badd7dbd.ce16",\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": 3355,\r
-        "y": 427,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3339,\r
+        "y": 408,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "13452ae4.22e4ad"\r
+                "5050eb58.e00ed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "556c2535.2cf6f4",\r
+        "id": "212f425.c6d5fbe",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4736,\r
-        "y": 780,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4720,\r
+        "y": 761,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "8b677154.0c28b8"\r
+                "656d86d7.e1bb3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b677154.0c28b8",\r
+        "id": "656d86d7.e1bb3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4913,\r
-        "y": 772,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4897,\r
+        "y": 753,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "dbe05c47.574588"\r
+                "4f5b4545.d432fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbe05c47.574588",\r
+        "id": "4f5b4545.d432fc",\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": 5148,\r
-        "y": 896,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5132,\r
+        "y": 877,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5346606.e9d9f",\r
+        "id": "5e5727f6.ce94f",\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": 5188,\r
-        "y": 1736,\r
-        "z": "4d37a11.42c136",\r
+        "x": 5172,\r
+        "y": 1717,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "279e5fe1.a8b868",\r
+        "id": "33761656.d7dc5a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4953,\r
-        "y": 1612,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4937,\r
+        "y": 1593,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "e5346606.e9d9f"\r
+                "5e5727f6.ce94f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3beefc43.434434",\r
+        "id": "ba30acec.499f9",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4776,\r
-        "y": 1620,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4760,\r
+        "y": 1601,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "279e5fe1.a8b868"\r
+                "33761656.d7dc5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21292318.735edc",\r
+        "id": "6b9897c8.516f28",\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": 2721,\r
-        "y": 2870,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2718,\r
+        "y": 3473,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "aa98c0a5.978718",\r
-                "47316c0a.b315dc"\r
+                "423bbf1a.980188",\r
+                "5a878bc1.0c7c24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47316c0a.b315dc",\r
+        "id": "5a878bc1.0c7c24",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2987,\r
-        "y": 2850,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2984,\r
+        "y": 3453,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "a7504bbe.eb60e"\r
+                "857ed73a.517d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa98c0a5.978718",\r
+        "id": "423bbf1a.980188",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2988.000213623047,\r
-        "y": 2900.99990940094,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2985.000213623047,\r
+        "y": 3503.99990940094,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "98c604c1.7b11b8"\r
+                "c8157b69.44d2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7504bbe.eb60e",\r
+        "id": "857ed73a.517d58",\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": 3127.0002479553223,\r
-        "y": 2850.0000009536743,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3124.0002479553223,\r
+        "y": 3453.0000009536743,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98c604c1.7b11b8",\r
+        "id": "c8157b69.44d2d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3133.02725982666,\r
-        "y": 2898.745394706726,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3130.02725982666,\r
+        "y": 3501.745394706726,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ce066c5d.e7734",\r
+        "id": "1473b1fb.f66ede",\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": 2721,\r
-        "y": 3236,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2718,\r
+        "y": 3839,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "77909c9d.223f24",\r
-                "d69f9ea8.7be4"\r
+                "8f6a2d0c.d8e1f8",\r
+                "9fe0565f.7886"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d69f9ea8.7be4",\r
+        "id": "9fe0565f.7886",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2987,\r
-        "y": 3216,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2984,\r
+        "y": 3819,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f7f9f969.a37708"\r
+                "9f93d2ab.f5b508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77909c9d.223f24",\r
+        "id": "8f6a2d0c.d8e1f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2988.000213623047,\r
-        "y": 3266.99990940094,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2985.000213623047,\r
+        "y": 3869.99990940094,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "cf24be41.03bc48"\r
+                "c9ec128c.8a9e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7f9f969.a37708",\r
+        "id": "9f93d2ab.f5b508",\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": 3127.0002479553223,\r
-        "y": 3216.0000009536743,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3124.0002479553223,\r
+        "y": 3819.0000009536743,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf24be41.03bc48",\r
+        "id": "c9ec128c.8a9e98",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3133.02725982666,\r
-        "y": 3264.745394706726,\r
-        "z": "4d37a11.42c136",\r
+        "x": 3130.02725982666,\r
+        "y": 3867.745394706726,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2e43483.a12bd",\r
+        "id": "420f3616.2f701",\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": 4394,\r
-        "y": 557,\r
-        "z": "4d37a11.42c136",\r
+        "x": 4378,\r
+        "y": 538,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "303c5717.c426f",\r
+        "id": "b1349530.c53cc",\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": 2750,\r
-        "y": 691,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2734,\r
+        "y": 672,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c19c2198.0de5c",\r
+        "id": "84b0870f.4db1e",\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": 2731,\r
-        "y": 741,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2715,\r
+        "y": 722,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "23c06925.0d2eb6",\r
+        "id": "2dfd81e1.a251ae",\r
         "type": "for",\r
         "name": "for each allotted-resource",\r
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1988,\r
-        "y": 243,\r
-        "z": "4d37a11.42c136",\r
+        "x": 1972,\r
+        "y": 224,\r
+        "z": "b31344e1.6b9228",\r
         "wires": [\r
             [\r
-                "f805b6b.c60f548",\r
-                "78e29884.225c08"\r
+                "3ffb610e.7895d6",\r
+                "1fed210d.6adb97"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f805b6b.c60f548",\r
+        "id": "3ffb610e.7895d6",\r
         "type": "set",\r
         "name": "set the current allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2272,\r
-        "y": 213,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2256,\r
+        "y": 194,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e927f664.5c872",\r
+        "id": "1f03402a.5db7",\r
         "type": "set",\r
         "name": "set query_param",\r
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",\r
         "comments": "",\r
-        "x": 2628,\r
-        "y": 2021,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2631,\r
+        "y": 2231,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29397b6c.248454",\r
+        "id": "56710693.e24068",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 2618,\r
-        "y": 3327,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2615,\r
+        "y": 3930,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     },\r
     {\r
-        "id": "488403ee.0379ac",\r
+        "id": "3323f682.f60c3a",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2688,\r
-        "y": 786,\r
-        "z": "4d37a11.42c136",\r
+        "x": 2672,\r
+        "y": 767,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "13ac3dbd.1f366a",\r
+        "type": "for",\r
+        "name": "for vidx..tmp.otninfo_length[]",\r
+        "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2666,\r
+        "y": 2351,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "f2924301.397558"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e2e68c3.addf6f",\r
+        "type": "switchNode",\r
+        "name": "switch srcPort == NULL",\r
+        "xml": "<switch test='`length($tmp.otninfo[$otnidx].srcPort) == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2936,\r
+        "y": 2353,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "2e3585b0.01a1f2",\r
+                "eadfc48d.7db62"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e3585b0.01a1f2",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3153,\r
+        "y": 2330,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "eadfc48d.7db62",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3153,\r
+        "y": 2377,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "91bb64fe.b40488"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91bb64fe.b40488",\r
+        "type": "switchNode",\r
+        "name": "switch srcPort == NULL",\r
+        "xml": "<switch test='`length($tmp.otninfo[$otnidx].dstPort) == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3356,\r
+        "y": 2376,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ecd0f109.dbad88",\r
+                "fd54750b.bb4c08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fd54750b.bb4c08",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3551,\r
+        "y": 2330,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ecd0f109.dbad88",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3549,\r
+        "y": 2370,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "647d2436.140504",\r
+        "type": "save",\r
+        "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='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\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3788,\r
+        "y": 2951,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "810630b1.0e1b6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fdfa6fb7.1a35f",\r
+        "type": "save",\r
+        "name": "save connectivity-A relationship to vpn-binding-A, in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4361.5,\r
+        "y": 3023,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "810630b1.0e1b6",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4094,\r
+        "y": 2950,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "a594830d.53acd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a594830d.53acd8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4303.5,\r
+        "y": 2950.25390625,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c295920.4b5da",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for vpn-binding $otnidx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3825,\r
+        "y": 2383,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "19452741.32e4c1",\r
+        "type": "switchNode",\r
+        "name": "switch otnidx == 0",\r
+        "xml": "<switch test='`$otnidx == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3698,\r
+        "y": 3036,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "9c40fb98.e1f61",\r
+                "20acba8d.85a5f6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c40fb98.e1f61",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3881,\r
+        "y": 3036,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "a42fc89d.d0c4a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "20acba8d.85a5f6",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3706,\r
+        "y": 3183,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "332942c6.7f663e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f5749296.6a691",\r
+        "type": "switchNode",\r
+        "name": "switch otnidx == last",\r
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4047,\r
+        "y": 3264,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "2103be8f.1fc842",\r
+                "1554c822.b8c828"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2103be8f.1fc842",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4232,\r
+        "y": 3265,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "a1250da6.1c6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1554c822.b8c828",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4251,\r
+        "y": 3531,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "99adbaff.3e741"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f416ea28.cb6ab",\r
+        "type": "save",\r
+        "name": "save connectivity-B relationship to vpn-binding-B, in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4662,\r
+        "y": 3266,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e6548b2c.2addd8",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for connectivity domain otnidx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4736,\r
+        "y": 3564,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ddd52155.f542e8",\r
+        "type": "save",\r
+        "name": "save connectivity resource in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='dummy' />\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": 4672,\r
+        "y": 3615,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a14f6e93.1adaf8",\r
+        "type": "save",\r
+        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4801,\r
+        "y": 3665,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "16a831c0.877516",\r
+        "type": "comment",\r
+        "name": "connectivity has not been created for middle domains, so we have to create one",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 4811,\r
+        "y": 3508,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2e301756.38a228",\r
+        "type": "save",\r
+        "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4769,\r
+        "y": 3724,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "99adbaff.3e741",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4408,\r
+        "y": 3532,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e6548b2c.2addd8",\r
+                "ddd52155.f542e8",\r
+                "a14f6e93.1adaf8",\r
+                "2e301756.38a228",\r
+                "ebae712b.9f6bf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f2924301.397558",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2918,\r
+        "y": 2412,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "4c295920.4b5da",\r
+                "647d2436.140504",\r
+                "19452741.32e4c1",\r
+                "1d59f70d.1ee6c9",\r
+                "b15a67ed.f1cb18",\r
+                "e4fb52b5.f04798",\r
+                "f5263d8c.0dd66"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e1edee2.ee8112",\r
+        "type": "set",\r
+        "name": "set attachment_param domain A",\r
+        "xml": "<set>\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\n\n\n",\r
+        "comments": "",\r
+        "x": 4286,\r
+        "y": 3080,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ba046748.bfe1b",\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": 4339,\r
+        "y": 3124,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b63ee960.cee2c",\r
+                "1b1f60e5.7a7c9f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b1f60e5.7a7c9f",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4610,\r
+        "y": 3109,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e9f5d50.e9a0928"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b63ee960.cee2c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4608.000213623047,\r
+        "y": 3166.99990940094,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "c9e53751.966bb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e9f5d50.e9a0928",\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": 4750.000247955322,\r
+        "y": 3109.0000009536743,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c9e53751.966bb8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4756.02725982666,\r
+        "y": 3157.745394706726,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a42fc89d.d0c4a",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4022,\r
+        "y": 3026,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "fdfa6fb7.1a35f",\r
+                "ba046748.bfe1b",\r
+                "2e1edee2.ee8112"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a1250da6.1c6",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4366,\r
+        "y": 3266,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "f416ea28.cb6ab",\r
+                "6f1cb48c.6026e4",\r
+                "1cf9708b.795d07"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1cf9708b.795d07",\r
+        "type": "set",\r
+        "name": "set attachment_param domain B",\r
+        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n\n",\r
+        "comments": "",\r
+        "x": 4586,\r
+        "y": 3310,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6f1cb48c.6026e4",\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": 4637,\r
+        "y": 3354,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "6e1323b5.c04ce4",\r
+                "1555b51f.0ca46b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1555b51f.0ca46b",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4900,\r
+        "y": 3334,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "7a3f18c.e7bf268"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6e1323b5.c04ce4",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4901.000213623047,\r
+        "y": 3384.99990940094,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "c1d2c5de.5e2688"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a3f18c.e7bf268",\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": 5040.000247955322,\r
+        "y": 3334.0000009536743,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c1d2c5de.5e2688",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5046.02725982666,\r
+        "y": 3382.745394706726,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ebae712b.9f6bf8",\r
+        "type": "set",\r
+        "name": "set attachment_param domain otnidx",\r
+        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n",\r
+        "comments": "",\r
+        "x": 4683,\r
+        "y": 3784,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b29e7a1b.0bb9",\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": 4727,\r
+        "y": 3902,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b649c2ac.1863c8",\r
+                "5df7a032.7812b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5df7a032.7812b8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4971,\r
+        "y": 3881,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "5f52118f.5992f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b649c2ac.1863c8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4976,\r
+        "y": 3938,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "d6363d68.6bc1d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f52118f.5992f",\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": 5111.000247955322,\r
+        "y": 3881.0000009536743,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d6363d68.6bc1d",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5121.027046203613,\r
+        "y": 3935.745485305786,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ff94df56.8391f8",\r
+        "type": "comment",\r
+        "name": "find domain-otnidx URL info from either src or dst pnf (src-access-node-id). However, eth network id is hard to find, unless hard code topology id 2",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 4931,\r
+        "y": 3844,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bc1d9c19.8a817",\r
+        "type": "save",\r
+        "name": "get all-vpn-bindings from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1986,\r
+        "y": 4143,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "3b12d36f.6d8234",\r
+                "89a53740.4d3c98",\r
+                "a61d86b5.6c70f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b12d36f.6d8234",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2197,\r
+        "y": 4145,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "3ced61cb.b2d7fe"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "89a53740.4d3c98",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2197.490966796875,\r
+        "y": 4190.574035644531,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "3eafcbaf.f2f56c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a61d86b5.6c70f",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2195,\r
+        "y": 4234,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "170e04a2.1b39fb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3ced61cb.b2d7fe",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2370,\r
+        "y": 4143,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ef9d0591.fefb08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3eafcbaf.f2f56c",\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": 2360.0623779296875,\r
+        "y": 4190.859771728516,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "170e04a2.1b39fb",\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": 2362,\r
+        "y": 4233,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bf30e0be.23b998",\r
+        "type": "for",\r
+        "name": "for vidx..tmp.otninfo_length[]",\r
+        "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1991,\r
+        "y": 4322,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "557999e1.77dcb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d613988a.0c40c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2801,\r
+        "y": 4322,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e4afc290.74f038"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7f46916.4f1ee",\r
+        "type": "for",\r
+        "name": "for vidx..tmp.otninfo_length[]",\r
+        "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2573,\r
+        "y": 4322,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "d613988a.0c40c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce29a297.cf1cb8",\r
+        "type": "set",\r
+        "name": "set providerValue",\r
+        "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",\r
+        "comments": "",\r
+        "x": 3003,\r
+        "y": 4085,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "90828ea.8f9357",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",\r
+        "comments": "",\r
+        "x": 3995,\r
+        "y": 3215,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "332942c6.7f663e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3830,\r
+        "y": 3190,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "90828ea.8f9357",\r
+                "f5749296.6a691"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d0adb7e4.435f98",\r
+        "type": "set",\r
+        "name": "set tmp.arr",\r
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1954,\r
+        "y": 170,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ef9d0591.fefb08",\r
+        "type": "for",\r
+        "name": "for vpnidx in all-vpn-bindings",\r
+        "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2611,\r
+        "y": 4145,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "2fbee9b.ff76316"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2fbee9b.ff76316",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2823,\r
+        "y": 4143,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ce29a297.cf1cb8",\r
+                "72392f69.a40338"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49f4d5cd.eba3ac",\r
+        "type": "for",\r
+        "name": "for arridx in tmp.arr",\r
+        "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3588,\r
+        "y": 4060,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "a296aaec.6a9f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "72392f69.a40338",\r
+        "type": "switchNode",\r
+        "name": "switch $tmp.arr_length != 0",\r
+        "xml": "<switch test='`$tmp.arr_length != 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3054,\r
+        "y": 4140,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "1e30cbc6.5b29c4",\r
+                "73a572c0.fcdcfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e30cbc6.5b29c4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3250,\r
+        "y": 4110,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "79192fda.22a8a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73a572c0.fcdcfc",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3251,\r
+        "y": 4181,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e5b5d449.e95738"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "79192fda.22a8a8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3401,\r
+        "y": 4108,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "49f4d5cd.eba3ac",\r
+                "ee34549a.68661"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a296aaec.6a9f7",\r
+        "type": "switchNode",\r
+        "name": "switch tmp.arr[$arridx] == $providerValue",\r
+        "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3879,\r
+        "y": 4060,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "f6a570fa.8c3e18",\r
+                "f096fdfa.51af18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f6a570fa.8c3e18",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4154,\r
+        "y": 4029,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "7e64bb9a.5c5954"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f096fdfa.51af18",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4155,\r
+        "y": 4100,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "2ae9b410.b8e274"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7e64bb9a.5c5954",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4305,\r
+        "y": 4027,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "883ad39b.46747",\r
+                "3d5cad7b.78211a",\r
+                "ac8bc417.7b82a",\r
+                "6ea95490.220544",\r
+                "6a39b9a6.2592"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "883ad39b.46747",\r
+        "type": "set",\r
+        "name": "set found to true",\r
+        "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",\r
+        "comments": "",\r
+        "x": 4486,\r
+        "y": 3988,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3d5cad7b.78211a",\r
+        "type": "save",\r
+        "name": "store $arridx somewhere in vpn-binding",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4565,\r
+        "y": 4032,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a39b9a6.2592",\r
+        "type": "set",\r
+        "name": "set twoD arr",\r
+        "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",\r
+        "comments": "",\r
+        "x": 4489,\r
+        "y": 4188,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6ea95490.220544",\r
+        "type": "set",\r
+        "name": "set sizeOfSliceList",\r
+        "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",\r
+        "comments": "",\r
+        "x": 4510,\r
+        "y": 4124,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "171513de.343584",\r
+        "type": "switchNode",\r
+        "name": "switch $otn-tunnel-slice_length == 0",\r
+        "xml": "<switch test='`$otn-tunnel-slice_length == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4668,\r
+        "y": 4078,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e6552b83.2df3a",\r
+                "b95e5493.31a9b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e6552b83.2df3a",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4900,\r
+        "y": 4041,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "9402566e.5ec598"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b95e5493.31a9b",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4901,\r
+        "y": 4089,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9402566e.5ec598",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5051,\r
+        "y": 4039,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b29e36f1.f6f35"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b29e36f1.f6f35",\r
+        "type": "set",\r
+        "name": "set sizeOfSliceList",\r
+        "xml": "<set>\n<!--<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />-->\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />\n<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[$arridx].list_length' value='1' />",\r
+        "comments": "",\r
+        "x": 5253,\r
+        "y": 4035,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e5b5d449.e95738",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3403,\r
+        "y": 4181,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b867d047.fac",\r
+                "3788e630.590d72"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b867d047.fac",\r
+        "type": "save",\r
+        "name": "store $arridx somewhere in vpn-binding",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3658,\r
+        "y": 4174,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3788e630.590d72",\r
+        "type": "set",\r
+        "name": "set twoD array",\r
+        "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",\r
+        "comments": "",\r
+        "x": 3586,\r
+        "y": 4221,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ee34549a.68661",\r
+        "type": "switchNode",\r
+        "name": "switch found?",\r
+        "xml": "<switch test='`$found`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3579,\r
+        "y": 4105,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "d1f76975.e11b9",\r
+                "3421ae07.ec9d62"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d1f76975.e11b9",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3739,\r
+        "y": 4097,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "2d9d0080.4d96d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3421ae07.ec9d62",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3737,\r
+        "y": 4134,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "91314308.ab84d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2d9d0080.4d96d",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3864,\r
+        "y": 4097,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fd3f24a6.bbbfb8",\r
+        "type": "save",\r
+        "name": "store $arridx+1 somewhere in vpn-binding",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4171,\r
+        "y": 4155,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "91314308.ab84d",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3897,\r
+        "y": 4142,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "fd3f24a6.bbbfb8",\r
+                "3fbaf181.1ff88e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3fbaf181.1ff88e",\r
+        "type": "set",\r
+        "name": "set twoD array",\r
+        "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",\r
+        "comments": "",\r
+        "x": 4088,\r
+        "y": 4201,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2ae9b410.b8e274",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4288,\r
+        "y": 4099,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ac8bc417.7b82a",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 4468,\r
+        "y": 4255,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1d59f70d.1ee6c9",\r
+        "type": "switchNode",\r
+        "name": "switch dstPort == NULL",\r
+        "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3528,\r
+        "y": 2442,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "13d01e4b.11cf72",\r
+                "f41dda2a.86b79"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "13d01e4b.11cf72",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3917,\r
+        "y": 2420,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "a63400f9.70b798"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f41dda2a.86b79",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3918,\r
+        "y": 2466,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "201cd4b0.391f6c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a63400f9.70b798",\r
+        "type": "set",\r
+        "name": "set access-provider-id and client-id",\r
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",\r
+        "comments": "",\r
+        "x": 4131,\r
+        "y": 2419,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "201cd4b0.391f6c",\r
+        "type": "set",\r
+        "name": "set access-provider-id and client-id",\r
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",\r
+        "comments": "",\r
+        "x": 4129,\r
+        "y": 2464,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e4afc290.74f038",\r
+        "type": "set",\r
+        "name": "set attachment_param sliceG",\r
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",\r
+        "comments": "",\r
+        "x": 3128,\r
+        "y": 4440,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a129ea2.020ec",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode sliceG creation domainG",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2714,\r
+        "y": 4534,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "235df5b8.967b5a",\r
+                "2fcb7bfa.e794ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2fcb7bfa.e794ec",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2997,\r
+        "y": 4514,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ec27b172.f3b03"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "235df5b8.967b5a",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2998.000213623047,\r
+        "y": 4564.99990940094,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "afac7d54.5ea3c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ec27b172.f3b03",\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": 3137.0002479553223,\r
+        "y": 4514.000000953674,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "afac7d54.5ea3c8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3143.02725982666,\r
+        "y": 4562.745394706726,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b15a67ed.f1cb18",\r
+        "type": "set",\r
+        "name": "set srcdstpnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3712,\r
+        "y": 2562,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e4fb52b5.f04798",\r
+        "type": "get-resource",\r
+        "name": "get-resource tmp.srcdstpnf-name",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3756,\r
+        "y": 2610,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "38280842.8f481",\r
+                "762394a6.8c9edc",\r
+                "bf6967d.9863518"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "38280842.8f481",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3968.5,\r
+        "y": 2557,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "7c3bab6c.40727c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "762394a6.8c9edc",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3980.5,\r
+        "y": 2607,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "9fa14d44.80429"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bf6967d.9863518",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3971.5,\r
+        "y": 2662,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "e6f16a7e.5e034"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e6f16a7e.5e034",\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": 4116.5,\r
+        "y": 2661,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9fa14d44.80429",\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": 4127.5,\r
+        "y": 2604,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7c3bab6c.40727c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4093.8824462890625,\r
+        "y": 2550.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "3ada39cb.077d7e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "79f49c03.b31834",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4653,\r
+        "y": 2569,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b38ec96c.50bcb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b38ec96c.50bcb",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4830,\r
+        "y": 2561,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b25407c2.fe4e9",\r
+                "76abd2d6.8cf2bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3ada39cb.077d7e",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4255,\r
+        "y": 2565,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "631c6ac2.9b4684"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "631c6ac2.9b4684",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4450,\r
+        "y": 2565,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "79f49c03.b31834"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76abd2d6.8cf2bc",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5038,\r
+        "y": 2568,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b500a3b6.711188",\r
+                "e4ff3e60.96d148",\r
+                "ef9c5a3.20232a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b25407c2.fe4e9",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainG id",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5068,\r
+        "y": 2516,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b500a3b6.711188",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5248,\r
+        "y": 2559,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "8c9a0f1.a2e9b7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e4ff3e60.96d148",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5240,\r
+        "y": 2614,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "7d5ba752.0bac28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef9c5a3.20232a8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5245,\r
+        "y": 2671,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "5979580a.e6b1f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5979580a.e6b1f8",\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": 5397,\r
+        "y": 2672,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7d5ba752.0bac28",\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": 5408,\r
+        "y": 2617,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8c9a0f1.a2e9b7",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5392.38232421875,\r
+        "y": 2556.6556701660156,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "b4fe40f1.fee308"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b4fe40f1.fee308",\r
+        "type": "set",\r
+        "name": "set controller domainA data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 5607,\r
+        "y": 2553,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "557999e1.77dcb",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2223,\r
+        "y": 4320,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "f7f46916.4f1ee",\r
+                "5a129ea2.020ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ba5097d.b20fe",\r
+        "type": "switchNode",\r
+        "name": "switch dmnsidx == 0 (domainA)",\r
+        "xml": "<switch test='`$dmnsidx == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3112,\r
+        "y": 4307,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "dbd9c4f1.fac738",\r
+                "119d0f31.7b8509"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dbd9c4f1.fac738",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3313,\r
+        "y": 4305,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "4fe6e9a2.ce8d7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4fe6e9a2.ce8d7",\r
+        "type": "set",\r
+        "name": "set attachment_param domain A",\r
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />",\r
+        "comments": "",\r
+        "x": 3527,\r
+        "y": 4307,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fd470af3.59fcc",\r
+        "type": "switchNode",\r
+        "name": "switch dmnsidx == last (domainB)",\r
+        "xml": "<switch test='`$dmnsidx == $otn-tunnel-slice_length - 1`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3530,\r
+        "y": 4356,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ddf1f941.709858",\r
+                "2f7e38f0.34a468"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ddf1f941.709858",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3731,\r
+        "y": 4354,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "5c127cf0.9c2d34"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5c127cf0.9c2d34",\r
+        "type": "set",\r
+        "name": "set attachment_param domain B",\r
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n",\r
+        "comments": "",\r
+        "x": 3945,\r
+        "y": 4356,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "119d0f31.7b8509",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3313,\r
+        "y": 4354,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "fd470af3.59fcc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2f7e38f0.34a468",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3732,\r
+        "y": 4400,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "4e4fdb4.a02e5a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4e4fdb4.a02e5a4",\r
+        "type": "set",\r
+        "name": "set attachment_param domain G",\r
+        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n",\r
+        "comments": "",\r
+        "x": 3946,\r
+        "y": 4399,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f5263d8c.0dd66",\r
+        "type": "switchNode",\r
+        "name": "switch dmnsidx == 0 (domainA)",\r
+        "xml": "<switch test='`$otnidx == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3726,\r
+        "y": 2779,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "cb45f40e.c4e9f",\r
+                "686c2e71.b364f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cb45f40e.c4e9f",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3927,\r
+        "y": 2777,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "906b7761.ec3cf"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "906b7761.ec3cf",\r
+        "type": "set",\r
+        "name": "set attachment_param domain A",\r
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
+        "comments": "",\r
+        "x": 4141,\r
+        "y": 2779,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bb50949c.2c4e68",\r
+        "type": "switchNode",\r
+        "name": "switch dmnsidx == last (domainB)",\r
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4144,\r
+        "y": 2828,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "f9f184f6.8f0c58",\r
+                "b1eb5cf.84b33a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f9f184f6.8f0c58",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4374,\r
+        "y": 2824,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "ea46128e.0ba028"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea46128e.0ba028",\r
+        "type": "set",\r
+        "name": "set attachment_param domain B",\r
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",\r
+        "comments": "",\r
+        "x": 4588,\r
+        "y": 2827,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "686c2e71.b364f8",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3927,\r
+        "y": 2826,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "bb50949c.2c4e68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b1eb5cf.84b33a",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4375,\r
+        "y": 2870,\r
+        "z": "b31344e1.6b9228",\r
+        "wires": [\r
+            [\r
+                "591dd2d5.72937c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "591dd2d5.72937c",\r
+        "type": "set",\r
+        "name": "set attachment_param domain G",\r
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
+        "comments": "",\r
+        "x": 4589,\r
+        "y": 2870,\r
+        "z": "b31344e1.6b9228",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index ff94831..594c381 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "9eb0ec9b.ca633",\r
+        "id": "35adbdc5.188712",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 136,\r
-        "y": 74,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 151,\r
+        "y": 71,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a6f9d5f0.04d6"\r
+                "4297efa6.c41f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6f9d5f0.04d6",\r
+        "id": "4297efa6.c41f88",\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": 267.2856903076172,\r
-        "y": 123.23810863494873,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 282.2856903076172,\r
+        "y": 120.23810863494873,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "3b0030c5.3e837"\r
+                "2ad96203.21cf3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b0030c5.3e837",\r
+        "id": "2ad96203.21cf3e",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 270.4286193847656,\r
-        "y": 208.00003242492676,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 285.4286193847656,\r
+        "y": 205.00003242492676,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "4b63b8a8.77bb4"\r
+                "c5e49e9b.1b684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b63b8a8.77bb4",\r
+        "id": "c5e49e9b.1b684",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 420.238037109375,\r
-        "y": 337.6666564941406,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 435.238037109375,\r
+        "y": 334.6666564941406,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "33834047.03c2f8",\r
-                "eaadc174.02e71",\r
-                "ce0777fc.b60f2"\r
+                "10e90581.65923a",\r
+                "8d427e09.40c998",\r
+                "2dc96b18.12e1c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33834047.03c2f8",\r
+        "id": "10e90581.65923a",\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": 694.5716552734375,\r
-        "y": 604.59716796875,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 709.5716552734375,\r
+        "y": 601.59716796875,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "39c1d7dd.5e2018",\r
+        "id": "dce41eb4.903f08",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 726,\r
-        "y": 279,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 741,\r
+        "y": 276,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaadc174.02e71",\r
+        "id": "8d427e09.40c998",\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": 746,\r
-        "y": 375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 761,\r
+        "y": 372,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "def73660.f1599",\r
-                "7ca16f67.a19498",\r
-                "6d28513b.423be8"\r
+                "97ab3694.d0f87",\r
+                "60789fd.ed86ae",\r
+                "353d8e4b.1a199a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "def73660.f1599",\r
+        "id": "97ab3694.d0f87",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 965,\r
-        "y": 313,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 980,\r
+        "y": 310,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "5c5bc497.c1130c"\r
+                "8832c029.be5808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca16f67.a19498",\r
+        "id": "60789fd.ed86ae",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 974.490966796875,\r
-        "y": 355.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 989.490966796875,\r
+        "y": 352.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "3202281d.474eb8"\r
+                "2dd666f1.60f502"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d28513b.423be8",\r
+        "id": "353d8e4b.1a199a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963,\r
-        "y": 402,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 978,\r
+        "y": 399,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a1d5aff9.d75b68"\r
+                "2d743c83.0345fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3202281d.474eb8",\r
+        "id": "2dd666f1.60f502",\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": 1128.0623779296875,\r
-        "y": 358.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1143.0623779296875,\r
+        "y": 355.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1d5aff9.d75b68",\r
+        "id": "2d743c83.0345fc",\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": 1132,\r
-        "y": 403,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1147,\r
+        "y": 400,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c5bc497.c1130c",\r
+        "id": "8832c029.be5808",\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": 1162,\r
-        "y": 309,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1177,\r
+        "y": 306,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b3c4b504.2321f"\r
+                "16acb367.7a1ddd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3c4b504.2321f",\r
+        "id": "16acb367.7a1ddd",\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": 1385.33349609375,\r
-        "y": 308.99993896484375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1400.33349609375,\r
+        "y": 305.99993896484375,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "2c61dbe.2d462a4"\r
+                "a7a6102a.ba70f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c61dbe.2d462a4",\r
+        "id": "a7a6102a.ba70f",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1586.0001335144043,\r
-        "y": 310.00002098083496,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1601.0001335144043,\r
+        "y": 307.00002098083496,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "8cb99e8e.6d2cc"\r
+                "792a8c98.1e353c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce0777fc.b60f2",\r
+        "id": "2dc96b18.12e1c4",\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": 712,\r
-        "y": 323,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 727,\r
+        "y": 320,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8cb99e8e.6d2cc",\r
+        "id": "792a8c98.1e353c",\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": 1824,\r
-        "y": 312,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1839,\r
+        "y": 309,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e48909d7.1167",\r
-                "9d9cf2b9.138cc",\r
-                "c57bdede.c607a8"\r
+                "e0088aed.90cab8",\r
+                "1c511732.20d971",\r
+                "948f74b1.a9b47"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e48909d7.1167",\r
+        "id": "e0088aed.90cab8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032,\r
-        "y": 276,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2047,\r
+        "y": 273,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "7447d3b7.3d9674"\r
+                "a90c3215.92b4f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9cf2b9.138cc",\r
+        "id": "1c511732.20d971",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032.490966796875,\r
-        "y": 321.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2047.490966796875,\r
+        "y": 318.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "c3f91382.355d78"\r
+                "4591cc1.5281eb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c57bdede.c607a8",\r
+        "id": "948f74b1.a9b47",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2030,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2045,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "8f45128e.10469"\r
+                "1ba65af4.0c86f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3f91382.355d78",\r
+        "id": "4591cc1.5281eb4",\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": 2195.0623779296875,\r
-        "y": 321.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2210.0623779296875,\r
+        "y": 318.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f45128e.10469",\r
+        "id": "1ba65af4.0c86f5",\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": 2199,\r
-        "y": 366,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2214,\r
+        "y": 363,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaa455f.69afea8",\r
+        "id": "782d486c.7b38a",\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": 2505,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2520,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "754a3f5.4e5d3c",\r
-                "563654a8.f8269c",\r
-                "49966192.933e3"\r
+                "15707889.fb5fe7",\r
+                "3ccb184b.88e97",\r
+                "5e6c2e34.e2f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44a58adf.5965ac",\r
+        "id": "d4d2edf0.a9661",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2889,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2904,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "c9dc240e.1f5cf8",\r
-                "2f80a99a.2436ee",\r
-                "eb52e479.fabdf8",\r
-                "e64ba97a.ab16f8"\r
+                "c5e1a2b5.98a7e",\r
+                "2ecd6ddc.b6312a",\r
+                "ac181d39.64071",\r
+                "31912d21.99f9da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754a3f5.4e5d3c",\r
+        "id": "15707889.fb5fe7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716,\r
-        "y": 367,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2731,\r
+        "y": 364,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "44a58adf.5965ac"\r
+                "d4d2edf0.a9661"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "563654a8.f8269c",\r
+        "id": "3ccb184b.88e97",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716.490966796875,\r
-        "y": 412.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2731.490966796875,\r
+        "y": 409.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "8ffd54c7.1ceb58"\r
+                "3858d983.a7895e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49966192.933e3",\r
+        "id": "5e6c2e34.e2f08",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2714,\r
-        "y": 456,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2729,\r
+        "y": 453,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "1dfb3bfc.f80f24"\r
+                "399a5685.b9c2da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dfb3bfc.f80f24",\r
+        "id": "399a5685.b9c2da",\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": 2881,\r
-        "y": 455,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2896,\r
+        "y": 452,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ffd54c7.1ceb58",\r
+        "id": "3858d983.a7895e",\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": 2879.0623779296875,\r
-        "y": 412.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2894.0623779296875,\r
+        "y": 409.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7447d3b7.3d9674",\r
+        "id": "a90c3215.92b4f8",\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": 2233,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2248,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "80b48506.a5c978"\r
+                "3cc76d7e.6842ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80b48506.a5c978",\r
+        "id": "3cc76d7e.6842ea",\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": 2438,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2453,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "36fdb5a2.702cb2"\r
+                "ff010487.c79c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36fdb5a2.702cb2",\r
+        "id": "ff010487.c79c18",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2604,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2619,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "32e2ef12.2d28f8"\r
+                "157282a.839557d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32e2ef12.2d28f8",\r
+        "id": "157282a.839557d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2767,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2782,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "eaa455f.69afea8"\r
+                "782d486c.7b38a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dc240e.1f5cf8",\r
+        "id": "c5e1a2b5.98a7e",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3104,\r
-        "y": 75,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3119,\r
+        "y": 72,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f80a99a.2436ee",\r
+        "id": "2ecd6ddc.b6312a",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3130,\r
-        "y": 192,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3145,\r
+        "y": 189,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "5dad328f.715b34",\r
-                "e3a6748e.a712d",\r
-                "e35e866f.df6d4"\r
+                "ca0e4afa.297db8",\r
+                "cbb19a06.cce2d",\r
+                "10037902.a01617"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dad328f.715b34",\r
+        "id": "ca0e4afa.297db8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3325.5001220703125,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3340.5001220703125,\r
+        "y": 141,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "4d0c253f.a81e74"\r
+                "82598cca.05691"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a6748e.a712d",\r
+        "id": "cbb19a06.cce2d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3317.5001220703125,\r
-        "y": 199,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3332.5001220703125,\r
+        "y": 196,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b2cddf9.b286da"\r
+                "3a772cbc.39a31c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0c253f.a81e74",\r
+        "id": "82598cca.05691",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3469.8824462890625,\r
-        "y": 143.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3484.8824462890625,\r
+        "y": 140.65567016601562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "1f908e24.7ffb6a"\r
+                "b1b02bec.6d78a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f908e24.7ffb6a",\r
+        "id": "b1b02bec.6d78a8",\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": 3654,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3669,\r
+        "y": 139,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "731e3134.cae0e8"\r
+                "cda97533.ab0b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "731e3134.cae0e8",\r
+        "id": "cda97533.ab0b4",\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": 3849,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3864,\r
+        "y": 139,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "924b0e47.33623"\r
+                "60c8c7.3864ef38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e35e866f.df6d4",\r
+        "id": "10037902.a01617",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322.5001220703125,\r
-        "y": 256,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3337.5001220703125,\r
+        "y": 253,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "96d892fb.bdb65"\r
+                "cae2235d.64e0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96d892fb.bdb65",\r
+        "id": "cae2235d.64e0e8",\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": 3474.5001220703125,\r
-        "y": 257,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3489.5001220703125,\r
+        "y": 254,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2cddf9.b286da",\r
+        "id": "3a772cbc.39a31c",\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": 3485.5001220703125,\r
-        "y": 200,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3500.5001220703125,\r
+        "y": 197,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5b1ba3f.53f16",\r
+        "id": "3932cb1e.2bf12c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4437,\r
-        "y": 159,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4452,\r
+        "y": 156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "24a03be4.6f22dc",\r
-                "9afded7b.e0fd88",\r
-                "473aa7de.af209"\r
+                "df685905.e165b",\r
+                "98483c83.1f67f",\r
+                "34f5861b.c6c222"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5beadfa.65d4b",\r
+        "id": "9b3be3e2.33ea88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4231,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4246,\r
+        "y": 143,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "c8e5909.1b608f",\r
-                "f5b1ba3f.53f16",\r
-                "f37bd9fd.aaa8a8"\r
+                "8f73936e.04261",\r
+                "3932cb1e.2bf12c",\r
+                "dea89443.748068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e5909.1b608f",\r
+        "id": "8f73936e.04261",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4467,\r
-        "y": 107,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4482,\r
+        "y": 104,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24a03be4.6f22dc",\r
+        "id": "df685905.e165b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4647,\r
-        "y": 150,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4662,\r
+        "y": 147,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "d0a9d6e9.c56f4"\r
+                "6f3db9ae.c9f3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9afded7b.e0fd88",\r
+        "id": "98483c83.1f67f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4639,\r
-        "y": 205,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4654,\r
+        "y": 202,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "27cca76b.e2c508"\r
+                "deb93f9d.19a93"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "473aa7de.af209",\r
+        "id": "34f5861b.c6c222",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4644,\r
-        "y": 262,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4659,\r
+        "y": 259,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "61a0060a.f22c2"\r
+                "e2596edd.60dea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a0060a.f22c2",\r
+        "id": "e2596edd.60dea",\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": 4796,\r
-        "y": 263,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4811,\r
+        "y": 260,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27cca76b.e2c508",\r
+        "id": "deb93f9d.19a93",\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": 4807,\r
-        "y": 208,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4822,\r
+        "y": 205,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0a9d6e9.c56f4",\r
+        "id": "6f3db9ae.c9f3c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4791.38232421875,\r
-        "y": 147.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4806.38232421875,\r
+        "y": 144.65567016601562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "67daf343.f6ee2c"\r
+                "ba0d3a6b.6f8058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "924b0e47.33623",\r
+        "id": "60c8c7.3864ef38",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4052,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4067,\r
+        "y": 143,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e5beadfa.65d4b"\r
+                "9b3be3e2.33ea88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67daf343.f6ee2c",\r
+        "id": "ba0d3a6b.6f8058",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5006,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 5021,\r
+        "y": 141,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f37bd9fd.aaa8a8",\r
+        "id": "dea89443.748068",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4387,\r
-        "y": 223,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4402,\r
+        "y": 220,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb52e479.fabdf8",\r
+        "id": "ebf8dd2b.b4f9e8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3260,\r
-        "y": 587,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3780,\r
+        "y": 569,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "f7e1f7cd.472128",\r
-                "cd5ebb71.771178"\r
+                "aec92995.7e9f5",\r
+                "4c597ddc.e2cc64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7e1f7cd.472128",\r
+        "id": "aec92995.7e9f5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3606.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4126.5,\r
+        "y": 562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e8c999cc.b2fcc"\r
+                "1a195df1.8c796a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5ebb71.771178",\r
+        "id": "4c597ddc.e2cc64",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3610.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4130.5,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "fe0f592f.73096"\r
+                "5902bc86.ae718c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe0f592f.73096",\r
+        "id": "5902bc86.ae718c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3768,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4288,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a35fbdc3.ba44d8",\r
-                "25ddb449.839c14"\r
+                "a5eabc9d.2ead",\r
+                "845fd62d.b8a278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c999cc.b2fcc",\r
+        "id": "1a195df1.8c796a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 3764.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4284.5,\r
+        "y": 562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a35fbdc3.ba44d8",\r
+        "id": "a5eabc9d.2ead",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4096.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4616.5,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "25ddb449.839c14",\r
+        "id": "845fd62d.b8a278",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4023.5,\r
-        "y": 666,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4543.5,\r
+        "y": 648,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e64ba97a.ab16f8",\r
+        "id": "ac181d39.64071",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3233,\r
-        "y": 459,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3248,\r
+        "y": 456,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e39876fb.5fed98",\r
-                "bba7f7ba.20df2"\r
+                "2d9a43b7.aafd44",\r
+                "70183a3.2a6c244"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e39876fb.5fed98",\r
+        "id": "2d9a43b7.aafd44",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3565.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3580.5,\r
+        "y": 426,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "577f2ccc.95a23c"\r
+                "2ca3b71b.283058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bba7f7ba.20df2",\r
+        "id": "70183a3.2a6c244",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3570.5,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3585.5,\r
+        "y": 491,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "f956764e.d59e5"\r
+                "7560af7d.2c0028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "577f2ccc.95a23c",\r
+        "id": "2ca3b71b.283058",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 3741.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3756.5,\r
+        "y": 426,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f956764e.d59e5",\r
+        "id": "7560af7d.2c0028",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3737,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3752,\r
+        "y": 491,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "31912d21.99f9da",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3186,\r
+        "y": 591,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            [\r
+                "8e1bec91.730a68",\r
+                "6d4b827f.139444"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6d4b827f.139444",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3439,\r
+        "y": 569,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            [\r
+                "ebf8dd2b.b4f9e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8e1bec91.730a68",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3439,\r
+        "y": 625,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
index 58ab642..fc756b8 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "2b0ca809.8b9448",\r
+        "id": "5a4a886b.6438b8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 190,\r
-        "y": 84,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 118,\r
+        "y": 82,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "d6cca48a.4b98c"\r
+                "2fc91b3e.7646fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6cca48a.4b98c",\r
+        "id": "2fc91b3e.7646fc",\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": 321.2856903076172,\r
-        "y": 133.23810863494873,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 249.2856903076172,\r
+        "y": 131.23810863494873,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "d504a218.d5b0f"\r
+                "1c977ea2.89d1e9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d504a218.d5b0f",\r
+        "id": "1c977ea2.89d1e9",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 324.4286193847656,\r
-        "y": 218.00003242492676,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 252.42861938476562,\r
+        "y": 216.00003242492676,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "6927f12e.f495a8"\r
+                "8ce10b59.587f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6927f12e.f495a8",\r
+        "id": "8ce10b59.587f08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 474.238037109375,\r
-        "y": 347.6666564941406,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 402.238037109375,\r
+        "y": 345.6666564941406,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "a03a6652.95082",\r
-                "5448151c.b0ab3c",\r
-                "926eb1f8.ec5de8"\r
+                "c14a5da1.726bc8",\r
+                "f7f11593.991128",\r
+                "fbeb2897.5d3ca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a03a6652.95082",\r
+        "id": "c14a5da1.726bc8",\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": 770.5716552734375,\r
-        "y": 624.59716796875,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 698.5716552734375,\r
+        "y": 622.59716796875,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de37ea5b.6e73f8",\r
+        "id": "86779e76.e7bc38",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 802,\r
-        "y": 299,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 730,\r
+        "y": 297,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5448151c.b0ab3c",\r
+        "id": "f7f11593.991128",\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\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": 822,\r
-        "y": 395,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 750,\r
+        "y": 393,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "84d63f33.5d595",\r
-                "bc6def6f.91b498",\r
-                "9f25bb22.1bcb28"\r
+                "6ad861a9.030e08",\r
+                "37e2fd06.c6c79a",\r
+                "2beeb8ca.34f3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84d63f33.5d595",\r
+        "id": "6ad861a9.030e08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1041,\r
-        "y": 333,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 969,\r
+        "y": 331,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "454b8601.544a2"\r
+                "c860abc6.0b576"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc6def6f.91b498",\r
+        "id": "37e2fd06.c6c79a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1050.490966796875,\r
-        "y": 375.57403564453125,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 978.490966796875,\r
+        "y": 373.57403564453125,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "6ae2b2ea.c01e64"\r
+                "7a133195.09b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f25bb22.1bcb28",\r
+        "id": "2beeb8ca.34f3f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1039,\r
-        "y": 422,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 967,\r
+        "y": 420,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "5abda4b4.ada70c"\r
+                "f9d75edb.c19d18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ae2b2ea.c01e64",\r
+        "id": "7a133195.09b68",\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": 1204.0623779296875,\r
-        "y": 378.8597717285156,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1132.0623779296875,\r
+        "y": 376.8597717285156,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5abda4b4.ada70c",\r
+        "id": "f9d75edb.c19d18",\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": 1208,\r
-        "y": 423,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1136,\r
+        "y": 421,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "454b8601.544a2",\r
+        "id": "c860abc6.0b576",\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": 1238,\r
-        "y": 329,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1166,\r
+        "y": 327,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "126fb5a4.b7562a"\r
+                "f376992c.11dc58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "126fb5a4.b7562a",\r
+        "id": "f376992c.11dc58",\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": 1461.33349609375,\r
-        "y": 328.99993896484375,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1389.33349609375,\r
+        "y": 326.99993896484375,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "ceb59f97.b5ebc"\r
+                "8db70c24.1a1f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ceb59f97.b5ebc",\r
+        "id": "8db70c24.1a1f5",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1662.0001335144043,\r
-        "y": 330.00002098083496,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1590.0001335144043,\r
+        "y": 328.00002098083496,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "7a55fd6d.840e7c"\r
+                "5dc8f559.ac7c5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "926eb1f8.ec5de8",\r
+        "id": "fbeb2897.5d3ca",\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": 788,\r
-        "y": 343,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 716,\r
+        "y": 341,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a55fd6d.840e7c",\r
+        "id": "5dc8f559.ac7c5c",\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": 1900,\r
-        "y": 332,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 1828,\r
+        "y": 330,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "ffc75917.89fb6",\r
-                "cc16da88.4c197",\r
-                "59e9aa76.56f554"\r
+                "17e90170.66a2cf",\r
+                "46c095c4.314d14",\r
+                "64e3b5e2.26b114"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffc75917.89fb6",\r
+        "id": "17e90170.66a2cf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2108,\r
-        "y": 296,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2036,\r
+        "y": 294,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "f17f297f.55ca2"\r
+                "c90d8c84.a14a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc16da88.4c197",\r
+        "id": "46c095c4.314d14",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2108.490966796875,\r
-        "y": 341.57403564453125,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2036.490966796875,\r
+        "y": 339.57403564453125,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "43ce3007.4fa548"\r
+                "3f9ff972.5c8816"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59e9aa76.56f554",\r
+        "id": "64e3b5e2.26b114",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2106,\r
-        "y": 385,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2034,\r
+        "y": 383,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "24973dde.e7929a"\r
+                "6b417e35.8fa86"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43ce3007.4fa548",\r
+        "id": "3f9ff972.5c8816",\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": 2271.0623779296875,\r
-        "y": 341.8597717285156,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2199.0623779296875,\r
+        "y": 339.8597717285156,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24973dde.e7929a",\r
+        "id": "6b417e35.8fa86",\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": 2275,\r
-        "y": 386,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2203,\r
+        "y": 384,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4afb06c.970a38",\r
+        "id": "62f4640b.361d2c",\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": 2581,\r
-        "y": 385,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2509,\r
+        "y": 383,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "70a3d3e9.7bf864",\r
-                "4cd17047.fe16a",\r
-                "c79d571c.0d07f8"\r
+                "41f800bd.97bbd8",\r
+                "3588ab7d.ccee3c",\r
+                "5014f1b1.a66d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e239cd5.1b82f8",\r
+        "id": "9b1454f6.71587",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2965,\r
-        "y": 385,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2893,\r
+        "y": 383,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "4fff45e1.354a6c",\r
-                "7b5f3a76.40dbac",\r
-                "daa0af8a.c7da5",\r
-                "1aa21051.71e3e8",\r
-                "3724be1f.92f8ea",\r
-                "f7cc948a.349f48",\r
-                "41f2a122.089c2"\r
+                "3ec88632.a3afda",\r
+                "ef2eaf52.5162b",\r
+                "74648c00.009a34",\r
+                "176c3740.91c4e1",\r
+                "a43ffa2e.f43268",\r
+                "b74320f6.969fd8",\r
+                "2043f8a6.e6867"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a3d3e9.7bf864",\r
+        "id": "41f800bd.97bbd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2792,\r
-        "y": 387,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2720,\r
+        "y": 385,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "8e239cd5.1b82f8"\r
+                "9b1454f6.71587"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cd17047.fe16a",\r
+        "id": "3588ab7d.ccee3c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2792.490966796875,\r
-        "y": 432.57403564453125,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2720.490966796875,\r
+        "y": 430.57403564453125,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "cc11f54d.5be868"\r
+                "f5b7e34a.e6a3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c79d571c.0d07f8",\r
+        "id": "5014f1b1.a66d2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2790,\r
-        "y": 476,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2718,\r
+        "y": 474,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "24a1d14c.bade0e"\r
+                "dad8e49f.e5f9b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24a1d14c.bade0e",\r
+        "id": "dad8e49f.e5f9b8",\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": 2957,\r
-        "y": 475,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2885,\r
+        "y": 473,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc11f54d.5be868",\r
+        "id": "f5b7e34a.e6a3a",\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": 2955.0623779296875,\r
-        "y": 432.8597717285156,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2883.0623779296875,\r
+        "y": 430.8597717285156,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f17f297f.55ca2",\r
+        "id": "c90d8c84.a14a1",\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": 2309,\r
-        "y": 291,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2237,\r
+        "y": 289,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "9cf4adfb.1d5c9"\r
+                "304af23b.91e62e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cf4adfb.1d5c9",\r
+        "id": "304af23b.91e62e",\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": 2514,\r
-        "y": 291,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2442,\r
+        "y": 289,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "6e0c0661.962a2"\r
+                "a73bd099.6c0378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e0c0661.962a2",\r
+        "id": "a73bd099.6c0378",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2680,\r
-        "y": 291,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2608,\r
+        "y": 289,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "cbe3f419.c9636"\r
+                "98e41266.eb692"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbe3f419.c9636",\r
+        "id": "98e41266.eb692",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2843,\r
-        "y": 291,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 2771,\r
+        "y": 289,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "e4afb06c.970a38"\r
+                "62f4640b.361d2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fff45e1.354a6c",\r
+        "id": "3ec88632.a3afda",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3180,\r
-        "y": 95,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3108,\r
+        "y": 93,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b5f3a76.40dbac",\r
+        "id": "ef2eaf52.5162b",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3206,\r
-        "y": 212,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3134,\r
+        "y": 210,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "38e8f6ad.20b942",\r
-                "30508f3.2b24cf",\r
-                "db6a4b33.6458e"\r
+                "d4d69c61.a67388",\r
+                "cc6ec5bd.14d058",\r
+                "7b98c47b.75268c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38e8f6ad.20b942",\r
+        "id": "d4d69c61.a67388",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3401.5001220703125,\r
-        "y": 164,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3329.5001220703125,\r
+        "y": 162,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "740719b1.df8a7"\r
+                "6766d137.85bc78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30508f3.2b24cf",\r
+        "id": "cc6ec5bd.14d058",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3393.5001220703125,\r
-        "y": 219,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3321.5001220703125,\r
+        "y": 217,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "dcbcbf80.f3d53"\r
+                "e5b8c6a7.d0685"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "740719b1.df8a7",\r
+        "id": "6766d137.85bc78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3545.8824462890625,\r
-        "y": 163.65567016601562,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3473.8824462890625,\r
+        "y": 161.65567016601562,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "1c636e54.f15ca2"\r
+                "6ec2253c.e8e2fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c636e54.f15ca2",\r
+        "id": "6ec2253c.e8e2fc",\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": 3730,\r
-        "y": 162,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3658,\r
+        "y": 160,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "5fbdc63d.dd85c8"\r
+                "8bfd549d.ff7578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fbdc63d.dd85c8",\r
+        "id": "8bfd549d.ff7578",\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": 3925,\r
-        "y": 162,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3853,\r
+        "y": 160,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "ea1a11a0.595418"\r
+                "e0432128.bf189"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db6a4b33.6458e",\r
+        "id": "7b98c47b.75268c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3398.5001220703125,\r
-        "y": 276,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3326.5001220703125,\r
+        "y": 274,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "1b105dc6.7eab4a"\r
+                "a0edf332.814bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b105dc6.7eab4a",\r
+        "id": "a0edf332.814bd",\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": 3550.5001220703125,\r
-        "y": 277,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3478.5001220703125,\r
+        "y": 275,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dcbcbf80.f3d53",\r
+        "id": "e5b8c6a7.d0685",\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": 3561.5001220703125,\r
-        "y": 220,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3489.5001220703125,\r
+        "y": 218,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96600252.0c8c48",\r
+        "id": "e1454ec0.76085",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4513,\r
-        "y": 179,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4441,\r
+        "y": 177,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "a696df4c.ceae58",\r
-                "fe810a19.c34a78",\r
-                "bbf2a8b1.f6a27"\r
+                "d8d8f637.323998",\r
+                "a47d1ee9.cdd92",\r
+                "e6ec849b.7b7268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "792a96dd.b5714",\r
+        "id": "682b00ad.3f22e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4307,\r
-        "y": 166,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4235,\r
+        "y": 164,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "ae074209.8ac108",\r
-                "96600252.0c8c48",\r
-                "17402644.74336a"\r
+                "e9dde318.2ce9c8",\r
+                "e1454ec0.76085",\r
+                "d1046ced.fbcef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae074209.8ac108",\r
+        "id": "e9dde318.2ce9c8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4543,\r
-        "y": 127,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4471,\r
+        "y": 125,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a696df4c.ceae58",\r
+        "id": "d8d8f637.323998",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4723,\r
-        "y": 170,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4651,\r
+        "y": 168,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "b9171802.93433"\r
+                "d20b8026.ed11d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe810a19.c34a78",\r
+        "id": "a47d1ee9.cdd92",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4715,\r
-        "y": 225,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4643,\r
+        "y": 223,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "4798e972.a0e21"\r
+                "8f556dc3.062b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbf2a8b1.f6a27",\r
+        "id": "e6ec849b.7b7268",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4720,\r
-        "y": 282,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4648,\r
+        "y": 280,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "c94f16ac.1ba968"\r
+                "c00b4c05.8ab27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c94f16ac.1ba968",\r
+        "id": "c00b4c05.8ab27",\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": 4872,\r
-        "y": 283,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4800,\r
+        "y": 281,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4798e972.a0e21",\r
+        "id": "8f556dc3.062b5",\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": 4883,\r
-        "y": 228,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4811,\r
+        "y": 226,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9171802.93433",\r
+        "id": "d20b8026.ed11d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4867.38232421875,\r
-        "y": 167.65567016601562,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4795.38232421875,\r
+        "y": 165.65567016601562,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "300135e0.73329a"\r
+                "3c8da8b7.eb2a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea1a11a0.595418",\r
+        "id": "e0432128.bf189",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4128,\r
-        "y": 166,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4056,\r
+        "y": 164,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "792a96dd.b5714"\r
+                "682b00ad.3f22e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "300135e0.73329a",\r
+        "id": "3c8da8b7.eb2a3",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5082,\r
-        "y": 164,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 5010,\r
+        "y": 162,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17402644.74336a",\r
+        "id": "d1046ced.fbcef8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4463,\r
-        "y": 243,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4391,\r
+        "y": 241,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7cc948a.349f48",\r
+        "id": "b74320f6.969fd8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete transport slice 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.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3330,\r
-        "y": 510,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3258,\r
+        "y": 508,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "c1188623.deee1",\r
-                "470e64d.379031c"\r
+                "5f11d071.d597d8",\r
+                "2c04f9a8.8e1bee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1188623.deee1",\r
+        "id": "5f11d071.d597d8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3673.5,\r
-        "y": 505,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3601.5,\r
+        "y": 503,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "d4cf9dc2.d5afd8"\r
+                "bc1a033f.a0f87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "470e64d.379031c",\r
+        "id": "2c04f9a8.8e1bee",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3677.5,\r
-        "y": 545,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3605.5,\r
+        "y": 543,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "3364bc79.06d9e4"\r
+                "14490b55.121775"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3364bc79.06d9e4",\r
+        "id": "14490b55.121775",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3835,\r
-        "y": 545,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3763,\r
+        "y": 543,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d4cf9dc2.d5afd8",\r
+        "id": "bc1a033f.a0f87",\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 deallocate transport slice rest api\" />\n",\r
         "comments": "",\r
-        "x": 3831.5,\r
-        "y": 505,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3759.5,\r
+        "y": 503,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "daa0af8a.c7da5",\r
+        "id": "74648c00.009a34",\r
         "type": "set",\r
         "name": "set attachment_param for TN NSSSI deleteion in PNC",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 3306,\r
-        "y": 385,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3234,\r
+        "y": 383,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1aa21051.71e3e8",\r
+        "id": "176c3740.91c4e1",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3236,\r
-        "y": 820,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3164,\r
+        "y": 818,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3724be1f.92f8ea",\r
+        "id": "a43ffa2e.f43268",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3232,\r
-        "y": 864,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3160,\r
+        "y": 862,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "41f2a122.089c2",\r
+        "id": "2ee33a01.a56356",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domain UNI deColoring",\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.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3293,\r
-        "y": 683,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 3744,\r
+        "y": 682,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "293d42c2.e74426",\r
-                "f9376496.43cea8"\r
+                "708d25c4.9f039c",\r
+                "9fd83c73.a107c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9376496.43cea8",\r
+        "id": "9fd83c73.a107c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3559,\r
-        "y": 663,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4010,\r
+        "y": 662,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "7b775591.92e164"\r
+                "a8d157b0.ef0838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "293d42c2.e74426",\r
+        "id": "708d25c4.9f039c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3560.000213623047,\r
-        "y": 713.9999094009399,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4011.000213623047,\r
+        "y": 712.9999094009399,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             [\r
-                "f17d1b1f.2fc66"\r
+                "aa9d5dd.46a2da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b775591.92e164",\r
+        "id": "a8d157b0.ef0838",\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 decoloring UNI rest api\" />\n",\r
         "comments": "",\r
-        "x": 3699.0002479553223,\r
-        "y": 663.0000009536743,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4150.000247955322,\r
+        "y": 662.0000009536743,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f17d1b1f.2fc66",\r
+        "id": "aa9d5dd.46a2da",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3705.02725982666,\r
-        "y": 711.7453947067261,\r
-        "z": "e001b214.9c4f88",\r
+        "x": 4156.02725982666,\r
+        "y": 710.7453947067261,\r
+        "z": "d544e90d.c47ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2043f8a6.e6867",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3193,\r
+        "y": 699,\r
+        "z": "d544e90d.c47ab8",\r
+        "wires": [\r
+            [\r
+                "f28924af.d151d",\r
+                "b67c4790.638238"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b67c4790.638238",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3431,\r
+        "y": 682,\r
+        "z": "d544e90d.c47ab8",\r
+        "wires": [\r
+            [\r
+                "2ee33a01.a56356"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f28924af.d151d",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3443,\r
+        "y": 749,\r
+        "z": "d544e90d.c47ab8",\r
         "wires": [\r
             []\r
         ]\r
index f6c1c6f..9faaccd 100644 (file)
                     <block></block>\r
                 </outcome>\r
             </execute>\r
+            <set>\r
+                <parameter name='`tmp.otninfo.`' value='' />\r
+                <parameter name='`tmp.otninfo_length`' value='0' />\r
+            </set>\r
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >\r
                 <block atomic="true">\r
                     <set>\r
@@ -60,6 +64,9 @@
                                                                         <set>\r
                                                                             <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />\r
                                                                             <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />\r
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->\r
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->\r
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->\r
                                                                         </set>\r
                                                                     </block>\r
                                                                 </outcome>\r
@@ -70,6 +77,9 @@
                                                                         <set>\r
                                                                             <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />\r
                                                                             <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />\r
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->\r
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->\r
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->\r
                                                                         </set>\r
                                                                     </block>\r
                                                                 </outcome>\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\r
                                                                                     </set>\r
                                                                                 </block>\r
                                                                             </outcome>\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />\r
                                                                                         <parameter name='domain-A.tpn' value='1' />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\r
                                                                                     </set>\r
                                                                                     <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\r
                                                                                         <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\r
                                                                                                                 <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />\r
                                                                                                                 <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />\r
                                                                                                                 <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />\r
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\r
                                                                                                             </set>\r
                                                                                                         </outcome>\r
                                                                                                     </get-resource>\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\r
                                                                                     </set>\r
                                                                                 </block>\r
                                                                             </outcome>\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />\r
                                                                                     </set>\r
                                                                                 </block>\r
                                                                             </outcome>\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />\r
                                                                                         <parameter name='domain-B.tpn' value='1' />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />\r
                                                                                     </set>\r
                                                                                     <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\r
                                                                                         <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\r
                                                                                                                 <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />\r
                                                                                                                 <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />\r
                                                                                                                 <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />\r
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />\r
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />\r
                                                                                                             </set>\r
                                                                                                         </outcome>\r
                                                                                                     </get-resource>\r
                                                                                 <block atomic="true">\r
                                                                                     <set>\r
                                                                                         <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />\r
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />\r
                                                                                     </set>\r
                                                                                 </block>\r
                                                                             </outcome>\r
index 40906da..34a7049 100644 (file)
                                                                     </set>\r
                                                                     <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\r
                                                                         <outcome value='Other'>\r
-                                                                            <block atomic="true">\r
-                                                                                <set>\r
-                                                                                    <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />\r
-                                                                                    <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />\r
-                                                                                </set>\r
-                                                                                <set>\r
-                                                                                    <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\r
-                                                                                    <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\r
-                                                                                    <!--<parameter name='dst-tpn-id' value='1' />-->\r
-                                                                                    <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\r
-                                                                                    <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\r
-                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                    <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
-                                                                                    <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\r
-                                                                                    <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\r
-                                                                                    <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\r
-                                                                                </set>\r
-                                                                                <set>\r
-                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +\r
+                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\r
+                                                                                <outcome value=''>\r
+                                                                                    <block atomic="true">\r
+                                                                                        <set>\r
+                                                                                            <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />\r
+                                                                                            <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />\r
+                                                                                        </set>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\r
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\r
+                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->\r
+                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\r
+                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\r
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\r
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\r
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\r
+                                                                                        </set>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +\r
                                                    $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\r
                                                    $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\r
                                                    $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\r
                                                    $tmp.aai.vpn-bindingA.src-access-node-id`" />\r
-                                                                                </set>\r
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                              resource="pnf"\r
-                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name"\r
-                                                                                              pfx='tmp.aai.source-pnf' local-only='false' >\r
-                                                                                    <!--AND depth = '0'"-->\r
-                                                                                    <outcome value='success'>\r
-                                                                                        <block>\r
-                                                                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\r
-                                                                                                <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
-                                                                                                    <outcome value='esr-thirdparty-sdnc'>\r
-                                                                                                        <block atomic="true">\r
-                                                                                                            <set>\r
-                                                                                                                <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
-                                                                                                            </set>\r
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                                          resource="esr-thirdparty-sdnc"\r
-                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND\r
+                                                                                        </set>\r
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                      resource="pnf"\r
+                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"\r
+                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >\r
+                                                                                            <!--AND depth = '0'"-->\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block>\r
+                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\r
+                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                                                <block atomic="true">\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                    </set>\r
+                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                  resource="esr-thirdparty-sdnc"\r
+                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND\r
+                    depth = '1'"\r
+                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                                        <outcome value='success'>\r
+                                                                                                                            <block>\r
+                                                                                                                                <set>\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                                    <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                </set>\r
+                                                                                                                            </block>\r
+                                                                                                                        </outcome>\r
+                                                                                                                        <outcome value='not-found'>\r
+                                                                                                                            <return status='failure'>\r
+                                                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                            </return>\r
+                                                                                                                        </outcome>\r
+                                                                                                                        <outcome value='Other'>\r
+                                                                                                                            <return status='failure'>\r
+                                                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                            </return>\r
+                                                                                                                        </outcome>\r
+                                                                                                                    </get-resource>\r
+                                                                                                                </block>\r
+                                                                                                            </outcome>\r
+                                                                                                        </switch>\r
+                                                                                                    </for>\r
+                                                                                                </block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='not-found'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='Other'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                        </get-resource>\r
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />\r
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />\r
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
+                                                                                            <parameter name="format" value="json"/>\r
+                                                                                            <parameter name="httpMethod" value="patch"/>\r
+                                                                                            <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                                            <outcome value='failure'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block atomic="true"></block>\r
+                                                                                            </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.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='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
+                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-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
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\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
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
+                                                                                            <parameter name="format" value="json"/>\r
+                                                                                            <parameter name="httpMethod" value="patch"/>\r
+                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                                                                                            <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                            <outcome value='failure'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block atomic="true">\r
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\r
+                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\r
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
+                                                                                                        <parameter name='operational-status' value='Activated' />\r
+                                                                                                    </update>\r
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\r
+                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\r
+                                                                                                        <parameter name='operational-status' value='Activated' />\r
+                                                                                                    </update>\r
+                                                                                                </block>\r
+                                                                                            </outcome>\r
+                                                                                        </execute>\r
+                                                                                    </block>\r
+                                                                                </outcome>\r
+                                                                                <outcome value='Other'>\r
+                                                                                    <block atomic="true">\r
+                                                                                        <set>\r
+                                                                                            <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />\r
+                                                                                            <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />\r
+                                                                                        </set>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\r
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\r
+                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->\r
+                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\r
+                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\r
+                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\r
+                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\r
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                            <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\r
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\r
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\r
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\r
+                                                                                        </set>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +\r
+                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\r
+                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\r
+                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\r
+                                                   $tmp.aai.vpn-bindingG.src-access-node-id`" />\r
+                                                                                        </set>\r
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                      resource="pnf"\r
+                                                                                                      key="pnf.pnf-name = $tmp.domainG.pnf-name"\r
+                                                                                                      pfx='tmp.aai.domainG-pnf' local-only='false' >\r
+                                                                                            <!--AND depth = '0'"-->\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block>\r
+                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\r
+                                                                                                        <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                                                <block atomic="true">\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                    </set>\r
+                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                  resource="esr-thirdparty-sdnc"\r
+                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
                     depth = '1'"\r
-                                                                                                                          pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >\r
-                                                                                                                <outcome value='success'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <set>\r
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                                                                            <!--<parameter name="format" value="json"/>-->\r
-                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
-                                                                                                                        </set>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='not-found'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='Other'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                            </get-resource>\r
-                                                                                                        </block>\r
-                                                                                                    </outcome>\r
-                                                                                                </switch>\r
-                                                                                            </for>\r
-                                                                                        </block>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='not-found'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='Other'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                </get-resource>\r
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />\r
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />\r
-                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                                                                    <parameter name="format" value="json"/>\r
-                                                                                    <parameter name="httpMethod" value="patch"/>\r
-                                                                                    <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                    <outcome value='failure'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                            <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='success'>\r
-                                                                                        <block atomic="true"></block>\r
-                                                                                    </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.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='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
-                                                                                    <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-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
-                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\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
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
-                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                                                                    <parameter name="format" value="json"/>\r
-                                                                                    <parameter name="httpMethod" value="patch"/>\r
-                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
-                                                                                    <parameter name="responsePrefix" value="vpn-result"/>\r
-                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                    <outcome value='failure'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                            <parameter name="error-message" value="Error executing Create ethernet service rest api" />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='success'>\r
-                                                                                        <block atomic="true">\r
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\r
-                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\r
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
-                                                                                                <parameter name='operational-status' value='Activated' />\r
-                                                                                            </update>\r
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
-                                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\r
-                                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\r
-                                                                                                <parameter name='operational-status' value='Activated' />\r
-                                                                                            </update>\r
-                                                                                        </block>\r
-                                                                                    </outcome>\r
-                                                                                </execute>\r
-                                                                            </block>\r
+                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                                        <outcome value='success'>\r
+                                                                                                                            <block>\r
+                                                                                                                                <set>\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                                    <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                </set>\r
+                                                                                                                            </block>\r
+                                                                                                                        </outcome>\r
+                                                                                                                        <outcome value='not-found'>\r
+                                                                                                                            <return status='failure'>\r
+                                                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                            </return>\r
+                                                                                                                        </outcome>\r
+                                                                                                                        <outcome value='Other'>\r
+                                                                                                                            <return status='failure'>\r
+                                                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                            </return>\r
+                                                                                                                        </outcome>\r
+                                                                                                                    </get-resource>\r
+                                                                                                                </block>\r
+                                                                                                            </outcome>\r
+                                                                                                        </switch>\r
+                                                                                                    </for>\r
+                                                                                                </block>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='not-found'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='Other'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                        </get-resource>\r
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />\r
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />\r
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />\r
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />\r
+                                                                                            <parameter name="format" value="json"/>\r
+                                                                                            <parameter name="httpMethod" value="patch"/>\r
+                                                                                            <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                                            <outcome value='failure'>\r
+                                                                                                <return status='failure'>\r
+                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />\r
+                                                                                                </return>\r
+                                                                                            </outcome>\r
+                                                                                            <outcome value='success'>\r
+                                                                                                <block atomic="true"></block>\r
+                                                                                            </outcome>\r
+                                                                                        </execute>\r
+                                                                                    </block>\r
+                                                                                </outcome>\r
+                                                                            </switch>\r
                                                                         </outcome>\r
                                                                         <outcome value=''>\r
                                                                             <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\r
index 88b7ddb..2cd9b56 100644 (file)
                         <outcome value='false'></outcome>\r
                         <outcome value='true'>\r
                             <block>\r
+                                <set>\r
+                                    <parameter name='tmp.arr' value='' />\r
+                                    <parameter name='tmp.arridx' value='0' />\r
+                                    <parameter name='tmp.arr_length' value='0' />\r
+                                    <parameter name='otn-tunnel-slice' value='' />\r
+                                    <parameter name='otn-tunnel-slice_length' value='0' />\r
+                                </set>\r
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\r
                                     <set>\r
                                         <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />\r
                                                                                                         <parameter name='prop.ethsrvType' value='`$network-route-A`' />\r
                                                                                                     </set>\r
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>\r
-                                                                                                    </execute>\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.otn-tunnel-name`' />\r
-                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\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
-                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\r
-                                                                                                        <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\r
-                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\r
-                                                                                                        <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
-                                                                                                        <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\r
-                                                                                                        <parameter name='src-access-ltp-id' value='' />\r
-                                                                                                        <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\r
-                                                                                                        <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\r
-                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />\r
-                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\r
-                                                                                                        <parameter name='operational-status' value='Created' />\r
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                        <outcome value='success'>\r
-                                                                                                            <block></block>\r
-                                                                                                        </outcome>\r
-                                                                                                    </save>\r
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'\r
-                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
-                                                                                                    </save>\r
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>\r
-                                                                                                    </execute>\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.otn-tunnel-name`' />\r
-                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\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
-                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\r
-                                                                                                        <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\r
-                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\r
-                                                                                                        <parameter name='src-access-node-id' value='`$domain-B.node-id`' />\r
-                                                                                                        <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\r
-                                                                                                        <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
-                                                                                                        <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\r
-                                                                                                        <parameter name='dst-access-ltp-id' value='' />\r
-                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />\r
-                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\r
-                                                                                                        <parameter name='operational-status' value='Created' />\r
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                        <outcome value='success'>\r
-                                                                                                            <block></block>\r
-                                                                                                        </outcome>\r
-                                                                                                    </save>\r
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'\r
-                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
-                                                                                                    </save>\r
+                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
+                                                                                                        <block atomic='true'>\r
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>\r
+                                                                                                            </execute>\r
+                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">\r
+                                                                                                                <outcome value='true'>\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\r
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\r
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\r
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                    </set>\r
+                                                                                                                </outcome>\r
+                                                                                                                <outcome value='false'>\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\r
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\r
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\r
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                    </set>\r
+                                                                                                                </outcome>\r
+                                                                                                            </switch>\r
+                                                                                                            <set>\r
+                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +\r
+                                             $tmp.access-provider-id + '-clientId-' +\r
+                                             $tmp.access-client-id + '-topologyId-' +\r
+                                             $tmp.access-topology-id + '-nodeId-' +\r
+                                             $tmp.srcdstpnf-id`" />\r
+                                                                                                            </set>\r
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                          resource="pnf"\r
+                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"\r
+                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >\r
+                                                                                                                <!--AND depth = '0'"-->\r
+                                                                                                                <outcome value='success'>\r
+                                                                                                                    <block>\r
+                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\r
+                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                                                                <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                                                                    <block atomic="true">\r
+                                                                                                                                        <set>\r
+                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                                        </set>\r
+                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                                      resource="esr-thirdparty-sdnc"\r
+                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
+                    depth = '1'"\r
+                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                                                            <outcome value='success'>\r
+                                                                                                                                                <block>\r
+                                                                                                                                                    <set>\r
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                                                        <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                    </set>\r
+                                                                                                                                                </block>\r
+                                                                                                                                            </outcome>\r
+                                                                                                                                            <outcome value='not-found'>\r
+                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                </return>\r
+                                                                                                                                            </outcome>\r
+                                                                                                                                            <outcome value='Other'>\r
+                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                </return>\r
+                                                                                                                                            </outcome>\r
+                                                                                                                                        </get-resource>\r
+                                                                                                                                    </block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </switch>\r
+                                                                                                                        </for>\r
+                                                                                                                    </block>\r
+                                                                                                                </outcome>\r
+                                                                                                                <outcome value='not-found'>\r
+                                                                                                                    <return status='failure'>\r
+                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                    </return>\r
+                                                                                                                </outcome>\r
+                                                                                                                <outcome value='Other'>\r
+                                                                                                                    <return status='failure'>\r
+                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                    </return>\r
+                                                                                                                </outcome>\r
+                                                                                                            </get-resource>\r
+                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                <outcome value='true'>\r
+                                                                                                                    <set>\r
+                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                    </set>\r
+                                                                                                                </outcome>\r
+                                                                                                                <outcome value='false'>\r
+                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                        <outcome value='true'>\r
+                                                                                                                            <set>\r
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+                                                                                                                            </set>\r
+                                                                                                                        </outcome>\r
+                                                                                                                        <outcome value='false'>\r
+                                                                                                                            <set>\r
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                            </set>\r
+                                                                                                                        </outcome>\r
+                                                                                                                    </switch>\r
+                                                                                                                </outcome>\r
+                                                                                                            </switch>\r
+                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\r
+                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\r
+                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
+                                                                                                                <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\r
+                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\r
+                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />\r
+                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\r
+                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\r
+                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\r
+                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
+                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
+                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />\r
+                                                                                                                <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\r
+                                                                                                                <parameter name='operational-status' value='Created' />\r
+                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
+                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
+                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
+                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+                                                                                                                <outcome value='success'>\r
+                                                                                                                    <block></block>\r
+                                                                                                                </outcome>\r
+                                                                                                            </save>\r
+                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                <outcome value='true'>\r
+                                                                                                                    <block>\r
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                        </save>\r
+                                                                                                                        <set>\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\r
+                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\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-coloring-uni-port.templatefile`" />\r
+                                                                                                                            <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' `" />\r
+                                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
+                                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
+                                                                                                                            <parameter name="format" value="json"/>\r
+                                                                                                                            <parameter name="httpMethod" value="patch"/>\r
+                                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                                                                            <outcome value='failure'>\r
+                                                                                                                                <return status='failure'>\r
+                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                    <parameter name="error-message" value="Error executing UNI Coloring for domain A" />\r
+                                                                                                                                </return>\r
+                                                                                                                            </outcome>\r
+                                                                                                                            <outcome value='success'>\r
+                                                                                                                                <block></block>\r
+                                                                                                                            </outcome>\r
+                                                                                                                        </execute>\r
+                                                                                                                    </block>\r
+                                                                                                                </outcome>\r
+                                                                                                                <outcome value='false'>\r
+                                                                                                                    <block>\r
+                                                                                                                        <set>\r
+                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />\r
+                                                                                                                        </set>\r
+                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                            <outcome value='true'>\r
+                                                                                                                                <block>\r
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                    </save>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->\r
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\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-coloring-uni-port.templatefile`" />\r
+                                                                                                                                        <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' `" />\r
+                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
+                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
+                                                                                                                                        <parameter name="format" value="json"/>\r
+                                                                                                                                        <parameter name="httpMethod" value="patch"/>\r
+                                                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                                                                                        <outcome value='failure'>\r
+                                                                                                                                            <return status='failure'>\r
+                                                                                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                <parameter name="error-code" value="500" />\r
+                                                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />\r
+                                                                                                                                            </return>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                        <outcome value='success'>\r
+                                                                                                                                            <block></block>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                    </execute>\r
+                                                                                                                                </block>\r
+                                                                                                                            </outcome>\r
+                                                                                                                            <outcome value='false'>\r
+                                                                                                                                <block atomic='true'>\r
+                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>\r
+                                                                                                                                    </execute>\r
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\r
+                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-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='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->\r
+                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
+                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
+                                                                                                                                        <parameter name='vpn-type' value='dummy' />\r
+                                                                                                                                        <!--<parameter name='CIR' value='`$prop.sotn.cir`' />-->\r
+                                                                                                                                        <!--<parameter name='EIR' value='`$prop.sotn.eir`' />-->\r
+                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
+                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
+                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
+                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
+                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
+                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
+                                                                                                                                        <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/'` " />\r
+                                                                                                                                    </save>\r
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                    </save>\r
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                    </save>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\r
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\r
+                                                                                                                                    </set>\r
+                                                                                                                                </block>\r
+                                                                                                                            </outcome>\r
+                                                                                                                        </switch>\r
+                                                                                                                    </block>\r
+                                                                                                                </outcome>\r
+                                                                                                            </switch>\r
+                                                                                                        </block>\r
+                                                                                                    </for>\r
                                                                                                     <set>\r
                                                                                                         <!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\r
                                                                                                         <!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\r
                                                                                                         <parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\r
                                                                                                         <!--otn-tunnel-slice-list[$idx]-->\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-coloring-uni-port.templatefile`" />\r
-                                                                                                        <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' `" />\r
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                                                                                        <parameter name="format" value="json"/>\r
-                                                                                                        <parameter name="httpMethod" value="patch"/>\r
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                        <outcome value='failure'>\r
-                                                                                                            <return status='failure'>\r
-                                                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                                                <parameter name="error-code" value="500" />\r
-                                                                                                                <parameter name="error-message" value="Error executing UNI Coloring for domain A" />\r
-                                                                                                            </return>\r
-                                                                                                        </outcome>\r
-                                                                                                        <outcome value='success'>\r
-                                                                                                            <block></block>\r
-                                                                                                        </outcome>\r
-                                                                                                    </execute>\r
                                                                                                     <set>\r
                                                                                                         <!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->\r
                                                                                                         <!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->\r
                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                         <parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\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-coloring-uni-port.templatefile`" />\r
-                                                                                                        <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' `" />\r
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
-                                                                                                        <parameter name="format" value="json"/>\r
-                                                                                                        <parameter name="httpMethod" value="patch"/>\r
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                        <outcome value='failure'>\r
-                                                                                                            <return status='failure'>\r
-                                                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                                                <parameter name="error-code" value="500" />\r
-                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />\r
-                                                                                                            </return>\r
-                                                                                                        </outcome>\r
-                                                                                                        <outcome value='success'>\r
-                                                                                                            <block></block>\r
-                                                                                                        </outcome>\r
-                                                                                                    </execute>\r
                                                                                                     <set>\r
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />\r
                                                                                                         <parameter name='domain-A.node-id' value='' />\r
                                         </outcome>\r
                                     </get-resource>\r
                                 </for>\r
-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />\r
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                    <parameter name="format" value="json"/>\r
-                                    <parameter name="httpMethod" value="post"/>\r
-                                    <parameter name="responsePrefix" value="otn-oof"/>\r
-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                    <outcome value='failure'>\r
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                              resource="vpn-bindings"\r
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings"\r
+                                              local-only="false"\r
+                                              pfx="tmp.aai.all-vpn-bindings" >\r
+                                    <outcome value='success'>\r
+                                        <block atomic="true">\r
+                                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\r
+                                                        <parameter name='found' value='false' />\r
+                                                    </set>\r
+                                                    <switch test='`$tmp.arr_length != 0`'>\r
+                                                        <outcome value='true'>\r
+                                                            <block atomic='true'>\r
+                                                                <for index='arridx' start='0' end='`$tmp.arr_length`' >\r
+                                                                    <switch test='`$tmp.arr[$arridx] == $providerValue`'>\r
+                                                                        <outcome value='true'>\r
+                                                                            <block atomic='true'>\r
+                                                                                <set>\r
+                                                                                    <parameter name='found' value='true' />\r
+                                                                                </set>\r
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
+                                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                    <parameter name='vpn-type' value='`$arridx`' />\r
+                                                                                </update>\r
+                                                                                <set>\r
+                                                                                    <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\r
+                                                                                </set>\r
+                                                                                <set>\r
+                                                                                    <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\r
+                                                                                    <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                                    <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\r
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\r
+                                                                                </set>\r
+                                                                                <break/>\r
+                                                                            </block>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='false'>\r
+                                                                            <block></block>\r
+                                                                        </outcome>\r
+                                                                    </switch>\r
+                                                                </for>\r
+                                                                <switch test='`$found`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <block></block>\r
+                                                                    </outcome>\r
+                                                                    <outcome value='false'>\r
+                                                                        <block atomic='true'>\r
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
+                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                <parameter name='vpn-type' value='`$arridx + 1`' />\r
+                                                                            </update>\r
+                                                                            <set>\r
+                                                                                <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\r
+                                                                                <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                                <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\r
+                                                                            </set>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                        <outcome value='false'>\r
+                                                            <block atomic='true'>\r
+                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
+                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                    <parameter name='vpn-type' value='0' />\r
+                                                                </update>\r
+                                                                <set>\r
+                                                                    <parameter name='tmp.arr[0]' value='`$providerValue`' />\r
+                                                                    <parameter name='tmp.arr_length' value='1' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                    <parameter name='otn-tunnel-slice_length' value='1' />\r
+                                                                    <parameter name='otn-tunnel-slice[0].list_length' value='1' />\r
+                                                                </set>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                </block>\r
+                                            </for>\r
+                                        </block>\r
+                                    </outcome>\r
+                                    <outcome value='not-found'>\r
                                         <return status='failure'>\r
                                             <parameter name='ack-final' value='Y'/>\r
                                             <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />\r
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
                                         </return>\r
                                     </outcome>\r
-                                    <outcome value='success'>\r
-                                        <block></block>\r
-                                    </outcome>\r
-                                </execute>\r
-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`" />\r
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />\r
-                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
-                                    <parameter name="format" value="json"/>\r
-                                    <parameter name="httpMethod" value="post"/>\r
-                                    <parameter name="responsePrefix" value="otn-oof"/>\r
-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                     <outcome value='failure'>\r
                                         <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />\r
+                                            <parameter name='error-code' value='' />\r
+                                            <parameter name='error-message' value='' />\r
                                         </return>\r
                                     </outcome>\r
-                                    <outcome value='success'>\r
-                                        <block></block>\r
-                                    </outcome>\r
-                                </execute>\r
+                                </get-resource>\r
+                                <for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\r
+                                    <block atomic='true'>\r
+                                        <for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\r
+                                            <block atomic='true'>\r
+                                                <set>\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`" />\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\r
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\r
+                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                    <parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\r
+                                                    <parameter name="tmp.domainG.restapiUrl" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`" />\r
+                                                    <parameter name="tmp.domainG.restapiUser" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`" />\r
+                                                    <parameter name="tmp.domainG.restapiPassword" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`" />\r
+                                                </set>\r
+                                            </block>\r
+                                        </for>\r
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`" />\r
+                                            <parameter name="restapiUrl" value="`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />\r
+                                            <parameter name="restapiUser" value="`$tmp.domainG.restapiUser`" />\r
+                                            <parameter name="restapiPassword" value="`tmp.domainG.restapiPassword`" />\r
+                                            <parameter name="format" value="json"/>\r
+                                            <parameter name="httpMethod" value="post"/>\r
+                                            <parameter name="responsePrefix" value="otn-oof"/>\r
+                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                            <outcome value='failure'>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='ack-final' value='Y'/>\r
+                                                    <parameter name="error-code" value="500" />\r
+                                                    <parameter name="error-message" value="Error executing slice creation api for domain A" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                            <outcome value='success'>\r
+                                                <block></block>\r
+                                            </outcome>\r
+                                        </execute>\r
+                                    </block>\r
+                                </for>\r
                             </block>\r
                         </outcome>\r
                     </switch>\r
index 214debf..6f26336 100644 (file)
                                                                             <block atomic="true"></block>\r
                                                                         </outcome>\r
                                                                     </execute>\r
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />\r
-                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->\r
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
-                                                                        <parameter name="format" value="json"/>\r
-                                                                        <parameter name="httpMethod" value="delete"/>\r
-                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
-                                                                        <parameter name="responsePrefix" value="vpn-result"/>\r
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                        <outcome value='failure'>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
-                                                                                <parameter name="error-message" value="Error executing delete ethernet service rest api" />\r
-                                                                            </return>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='success'>\r
-                                                                            <block atomic="true">\r
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\r
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\r
-                                                                                    <parameter name='operational-status' value='Deactivated' />\r
-                                                                                </update>\r
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
-                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\r
-                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\r
-                                                                                    <parameter name='operational-status' value='Deactivated' />\r
-                                                                                </update>\r
-                                                                            </block>\r
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>\r
+                                                                        <outcome value='Other'>\r
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />\r
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->\r
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
+                                                                                <parameter name="format" value="json"/>\r
+                                                                                <parameter name="httpMethod" value="delete"/>\r
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                <outcome value='failure'>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="Error executing delete ethernet service rest api" />\r
+                                                                                    </return>\r
+                                                                                </outcome>\r
+                                                                                <outcome value='success'>\r
+                                                                                    <block atomic="true">\r
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\r
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
+                                                                                            <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\r
+                                                                                            <parameter name='operational-status' value='Deactivated' />\r
+                                                                                        </update>\r
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\r
+                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\r
+                                                                                            <parameter name='operational-status' value='Deactivated' />\r
+                                                                                        </update>\r
+                                                                                    </block>\r
+                                                                                </outcome>\r
+                                                                            </execute>\r
                                                                         </outcome>\r
-                                                                    </execute>\r
+                                                                        <outcome value=''></outcome>\r
+                                                                    </switch>\r
                                                                 </block>\r
                                                             </outcome>\r
                                                             <outcome value='not-found'>\r
index b6ddc9a..7c6e65f 100644 (file)
                                                                             <block atomic="true"></block>\r
                                                                         </outcome>\r
                                                                     </execute>\r
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />\r
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
-                                                                        <parameter name="format" value="json"/>\r
-                                                                        <parameter name="httpMethod" value="delete"/>\r
-                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                        <outcome value='failure'>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
-                                                                                <parameter name="error-message" value="Error executing decoloring UNI rest api" />\r
-                                                                            </return>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='success'>\r
-                                                                            <block></block>\r
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>\r
+                                                                        <outcome value='Other'>\r
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->\r
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />\r
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
+                                                                                <parameter name="format" value="json"/>\r
+                                                                                <parameter name="httpMethod" value="delete"/>\r
+                                                                                <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                                <outcome value='failure'>\r
+                                                                                    <return status='failure'>\r
+                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                        <parameter name="error-message" value="Error executing decoloring UNI rest api" />\r
+                                                                                    </return>\r
+                                                                                </outcome>\r
+                                                                                <outcome value='success'>\r
+                                                                                    <block></block>\r
+                                                                                </outcome>\r
+                                                                            </execute>\r
                                                                         </outcome>\r
-                                                                    </execute>\r
+                                                                        <outcome value=''></outcome>\r
+                                                                    </switch>\r
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>\r
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
diff --git a/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceG-list.json b/platform-logic/restapi-templates/src/main/json/ts-allocate-tn-sliceG-list.json
new file mode 100644 (file)
index 0000000..1699a73
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "ietf-optical-slice:input": {
+    "otn-tunnel-list": [
+
+        ${repeat:otn-tunnel-sliceG-list_length:
+            {
+              "tunnel-name": ${otn-tunnel-sliceG-list[${1}].request-id},
+              "source": ${otn-tunnel-sliceG-list[${1}].otn-source-node},
+              "destination": ${otn-tunnel-sliceG-list[${1}].otn-dest-node},
+              "tunnel-bandwidth": ${otn-tunnel-sliceG-list[${1}].bw-odu},
+              "src-tunnel-tp-id": ${otn-tunnel-sliceG-list[${1}].src-ttp-id},
+              "dst-tunnel-tp-id": ${otn-tunnel-sliceG-list[${1}].dst-ttp-id}
+            },
+        }
+
+      ],
+
+      "slice-id": ${slice-instance-id}
+
+   }
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json
new file mode 100644 (file)
index 0000000..465b954
--- /dev/null
@@ -0,0 +1,38 @@
+{
+  "ietf-te:te": {
+    "tunnels": {
+      "tunnel": [
+        {
+          "source": ${src-node-id},
+          "destination": ${dst-node-id},
+          "ietf-otn-tunnel:src-tpn": ${src-tpn-id},
+          "src-ttp-id": ${src-ttp-id},
+          "ietf-otn-tunnel:dst-tpn": ${dst-tpn-id},
+          "dst-ttp-id": ${dst-ttp-id},
+          "te-bandwidth": {
+            "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
+            "ietf-otn-tunnel:gfp-n": ${gfp-n}
+          },
+          "ietf-otn-tunnel:dst-tributary-slot-count": 1,
+          "ietf-optical-slice:slice-id": ${slice-instance-id},
+          "encoding": "ietf-te-types:lsp-encoding-oduk",
+          "name": ${otn-tunnel-name-domainG},
+          "restoration": {
+            "enable": "false",
+            "hold-off-time": "0",
+            "restoration-reversion-disable": "true",
+            "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+            "wait-to-revert": "0"
+          },
+          "switching-type": "ietf-te-types:switching-otn",
+          "te-topology-identifier": {
+            "client-id": ${client-id},
+            "provider-id": ${provider-id},
+            "topology-id": ${topology-id}
+          },
+          "provisioning-state": "ietf-te-types:tunnel-state-up"
+        }
+      ]
+    }
+  }
+}