Support for "Modify" operation of a given Transport Slice.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json

index a1b68a6..d6eb686 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "d5615e24.a00ab8",\r
+        "id": "eb07fd3d.499fe",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 156,\r
-        "y": 95,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 142,\r
+        "y": 92,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "90741178.637a68"\r
+                "39c5ac20.45e1d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90741178.637a68",\r
+        "id": "39c5ac20.45e1d4",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,1741 +22,2328 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 287.2856903076172,\r
-        "y": 144.23810863494873,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 273.2856903076172,\r
+        "y": 141.23810863494873,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "e9aee376.235818"\r
+                "2ea16900.365168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9aee376.235818",\r
+        "id": "2ea16900.365168",\r
          "type": "method",\r
          "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
          "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 290.4286193847656,\r
-        "y": 229.00003242492676,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 276.4286193847656,\r
+        "y": 226.00003242492676,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "9c8b5d20.5b6ef8"\r
+                "65a4788.f116c88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c8b5d20.5b6ef8",\r
+        "id": "65a4788.f116c88",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 440.238037109375,\r
-        "y": 358.6666564941406,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 426.238037109375,\r
+        "y": 355.6666564941406,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f1c1dc9b.59851",\r
-                "40fee6aa.417918",\r
-                "a3f28ac6.d30ed8"\r
+                "57f656d8.02c09",\r
+                "6ee54bdc.2fdd5c",\r
+                "4cf7ab90.c1f3ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1c1dc9b.59851",\r
+        "id": "57f656d8.02c09",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
-        "x": 708.5716552734375,\r
-        "y": 745.59716796875,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 694.5716552734375,\r
+        "y": 742.59716796875,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e4fd4d94.2b8ec8",\r
+        "id": "d36cebd.8be9418",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 740,\r
-        "y": 420,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 726,\r
+        "y": 417,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40fee6aa.417918",\r
+        "id": "6ee54bdc.2fdd5c",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 760,\r
-        "y": 516,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 746,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "15f2cda7.88709a",\r
-                "187b249d.3c85cb",\r
-                "c12e657e.e2c7f8"\r
+                "4321e029.b0b21",\r
+                "df857197.b37508",\r
+                "caa9bf62.bc7768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15f2cda7.88709a",\r
+        "id": "4321e029.b0b21",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 979,\r
-        "y": 454,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 965,\r
+        "y": 451,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "56c6117d.ed7bc"\r
+                "1399e348.49a41d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "187b249d.3c85cb",\r
+        "id": "df857197.b37508",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 988.490966796875,\r
-        "y": 496.57403564453125,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 974.490966796875,\r
+        "y": 493.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "dd3e3cac.482ca8"\r
+                "9c66f3b5.ba5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c12e657e.e2c7f8",\r
+        "id": "caa9bf62.bc7768",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 977,\r
-        "y": 543,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 963,\r
+        "y": 540,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d7bbbdd4.b85c7"\r
+                "83f89a00.0c0e7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd3e3cac.482ca8",\r
+        "id": "9c66f3b5.ba5a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1142.0623779296875,\r
-        "y": 499.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1128.0623779296875,\r
+        "y": 496.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d7bbbdd4.b85c7",\r
+        "id": "83f89a00.0c0e7",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1146,\r
-        "y": 544,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1132,\r
+        "y": 541,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "56c6117d.ed7bc",\r
+        "id": "1399e348.49a41d",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1176,\r
-        "y": 450,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1162,\r
+        "y": 447,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "68f0da0a.13a494"\r
+                "8c655e36.efa51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "68f0da0a.13a494",\r
+        "id": "8c655e36.efa51",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1399.33349609375,\r
-        "y": 449.99993896484375,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1385.33349609375,\r
+        "y": 446.99993896484375,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a37a9810.801788"\r
+                "dae7ff66.9b9c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a37a9810.801788",\r
+        "id": "dae7ff66.9b9c6",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1600.0001335144043,\r
-        "y": 451.00002098083496,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1586.0001335144043,\r
+        "y": 448.00002098083496,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "2d3714db.b7aad4"\r
+                "5afc15bc.b14b2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d56fd4f.8da4ea",\r
+        "id": "73d91f0d.979448",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
+        "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": 3861,\r
-        "y": 170,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4405,\r
+        "y": 164,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "119d7057.187e9",\r
+        "id": "53d5aef.e4ebbd",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3942,\r
-        "y": 485,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4486,\r
+        "y": 479,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a078109.a1f9bf",\r
-                "c205f5c4.0bdb88"\r
+                "ecc00da.2c7107",\r
+                "8ec5d396.327df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a078109.a1f9bf",\r
+        "id": "ecc00da.2c7107",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4251.5,\r
-        "y": 454,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4795.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3b38ca16.a7fb4e"\r
+                "30cb0de4.d526fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c205f5c4.0bdb88",\r
+        "id": "8ec5d396.327df",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4256.5,\r
-        "y": 519,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4800.5,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "176e9242.258856"\r
+                "d98d92f9.c81fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b38ca16.a7fb4e",\r
+        "id": "30cb0de4.d526fa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4427.5,\r
-        "y": 454,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4971.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "176e9242.258856",\r
+        "id": "d98d92f9.c81fa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4423,\r
-        "y": 519,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4967,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ab834e.f483fcb",\r
+        "id": "b72def38.869578",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 3808.5,\r
-        "y": 673,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4352.5,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9d60073.e2df48",\r
+        "id": "61d206ce.c84cc",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3962.5,\r
-        "y": 721,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4506.5,\r
+        "y": 715,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "1e624148.f51b17",\r
-                "9b38443d.36a338"\r
+                "4c218232.9ff344",\r
+                "70cfc429.d9d73c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e624148.f51b17",\r
+        "id": "4c218232.9ff344",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4308,\r
-        "y": 702,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4852,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "20712318.8d32fc"\r
+                "508ab9bd.6f59b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b38443d.36a338",\r
+        "id": "70cfc429.d9d73c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4312,\r
-        "y": 742,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4856,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a4fdbce9.b1c4"\r
+                "4484b215.bd52a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20712318.8d32fc",\r
+        "id": "508ab9bd.6f59b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4466,\r
-        "y": 702,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5010,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fdbce9.b1c4",\r
+        "id": "4484b215.bd52a4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4469.5,\r
-        "y": 742,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5013.5,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f9579fb7.928158",\r
-                "b5483433.ff3288"\r
+                "d5eb1314.bae0c8",\r
+                "10b6b358.4dd2d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "320ccbea.c02274",\r
+        "id": "1158b528.feaadb",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3806,\r
-        "y": 629,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4350,\r
+        "y": 623,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9579fb7.928158",\r
+        "id": "d5eb1314.bae0c8",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "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": 4800,\r
-        "y": 707,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5344,\r
+        "y": 701,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d3281524.0d8478",\r
+        "id": "4e452bee.48e2ac",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4664,\r
-        "y": 666,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5208,\r
+        "y": 660,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5483433.ff3288",\r
+        "id": "10b6b358.4dd2d5",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4727,\r
-        "y": 753,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5271,\r
+        "y": 747,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5074df67.2ba988",\r
+        "id": "cdb19fe7.3fcc18",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3799,\r
-        "y": 218,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4343,\r
+        "y": 212,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fd13730.014208",\r
+        "id": "83225463.070fc",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3825,\r
-        "y": 335,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4369,\r
+        "y": 329,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "e11a5ea7.685f28",\r
-                "6cb0b7a8.80c24",\r
-                "a90c44f8.bdb148"\r
+                "c77a135e.0cf11",\r
+                "733c4b21.b0276c",\r
+                "dfbdc2b7.10d7d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e11a5ea7.685f28",\r
+        "id": "c77a135e.0cf11",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4020.5001220703125,\r
-        "y": 287,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4564.5001220703125,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "dfb8903c.c1b1d8"\r
+                "fc1575d4.07ce9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6cb0b7a8.80c24",\r
+        "id": "733c4b21.b0276c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4012.5001220703125,\r
-        "y": 342,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4556.5001220703125,\r
+        "y": 336,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "509847ff.264c58"\r
+                "2d634f91.a839c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfb8903c.c1b1d8",\r
+        "id": "fc1575d4.07ce9",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4164.8824462890625,\r
-        "y": 286.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4708.8824462890625,\r
+        "y": 280.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "22c6d630.71326a"\r
+                "26c3005d.c41c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e775dc4.42bfbc",\r
+        "id": "fb614f2c.314568",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4747,\r
-        "y": 289,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5291,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f76a815f.36c178"\r
+                "5511aade.71874c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22c6d630.71326a",\r
+        "id": "26c3005d.c41c58",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4349,\r
-        "y": 285,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4893,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a3e1c0eb.9f5f88"\r
+                "d1afc9f2.3db068"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3e1c0eb.9f5f88",\r
+        "id": "d1afc9f2.3db068",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4544,\r
-        "y": 285,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5088,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5e775dc4.42bfbc"\r
+                "fb614f2c.314568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a90c44f8.bdb148",\r
+        "id": "dfbdc2b7.10d7d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4017.5001220703125,\r
-        "y": 399,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4561.5001220703125,\r
+        "y": 393,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7a5f3123.aad6e8"\r
+                "1874b649.d37aaa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a5f3123.aad6e8",\r
+        "id": "1874b649.d37aaa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4169.5001220703125,\r
-        "y": 400,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4713.5001220703125,\r
+        "y": 394,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "509847ff.264c58",\r
+        "id": "2d634f91.a839c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4180.5001220703125,\r
-        "y": 343,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4724.5001220703125,\r
+        "y": 337,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ab5c9a1.06e3f",\r
+        "id": "37df0014.a385b",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5132,\r
-        "y": 302,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5676,\r
+        "y": 296,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "73f9ea02.2fb1e4",\r
-                "f8008145.65a48",\r
-                "81ec8b7a.5856d8"\r
+                "43de30da.db75e8",\r
+                "e5ad5cbe.572928",\r
+                "12e2c219.e2a25e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f76a815f.36c178",\r
+        "id": "5511aade.71874c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4926,\r
-        "y": 289,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5470,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ba856b81.43ed78",\r
-                "4ab5c9a1.06e3f"\r
+                "29681795.e63f18",\r
+                "37df0014.a385b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba856b81.43ed78",\r
+        "id": "29681795.e63f18",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5162,\r
-        "y": 250,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5706,\r
+        "y": 244,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f9ea02.2fb1e4",\r
+        "id": "43de30da.db75e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5342,\r
-        "y": 293,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5886,\r
+        "y": 287,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5955dc9c.10f754"\r
+                "9fb5e37f.eaa9f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8008145.65a48",\r
+        "id": "e5ad5cbe.572928",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5334,\r
-        "y": 348,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5878,\r
+        "y": 342,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "e3286b6.68c7618"\r
+                "24f5f29e.218576"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81ec8b7a.5856d8",\r
+        "id": "12e2c219.e2a25e",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5339,\r
-        "y": 405,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5883,\r
+        "y": 399,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ecd34f94.c447e"\r
+                "cd568772.16e428"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ecd34f94.c447e",\r
+        "id": "cd568772.16e428",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5491,\r
-        "y": 406,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6035,\r
+        "y": 400,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e3286b6.68c7618",\r
+        "id": "24f5f29e.218576",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5502,\r
-        "y": 351,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6046,\r
+        "y": 345,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5955dc9c.10f754",\r
+        "id": "9fb5e37f.eaa9f",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5486.38232421875,\r
-        "y": 290.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6030.38232421875,\r
+        "y": 284.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "adf5d068.f7cc"\r
+                "2b11e0ba.ac6cd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adf5d068.f7cc",\r
+        "id": "2b11e0ba.ac6cd8",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5701,\r
-        "y": 287,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 6245,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3f28ac6.d30ed8",\r
+        "id": "4cf7ab90.c1f3ec",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 726,\r
-        "y": 464,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 712,\r
+        "y": 461,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b8f0eb5.a171218",\r
+        "id": "fec1365a.907b4",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
+        "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": 3841,\r
-        "y": 974,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3812,\r
+        "y": 1621,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d94b849.7fdac78",\r
+        "id": "eb21cc8f.003df8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3904,\r
-        "y": 1303,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3875,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "bfb79ead.715e28",\r
-                "d50b4560.d85de8"\r
+                "fc655ff.669232",\r
+                "dfbdc395.b4aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfb79ead.715e28",\r
+        "id": "fc655ff.669232",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4199.5,\r
-        "y": 1270,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4170.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3d3c3af3.12a3b6"\r
+                "d2ad58a1.dbb57"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d50b4560.d85de8",\r
+        "id": "dfbdc395.b4aa",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4204.5,\r
-        "y": 1335,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4175.5,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "347f5539.8f6cd2"\r
+                "43fba27a.3e8bd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d3c3af3.12a3b6",\r
+        "id": "d2ad58a1.dbb57",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4367.5,\r
-        "y": 1270,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4338.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "347f5539.8f6cd2",\r
+        "id": "43fba27a.3e8bd4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4378,\r
-        "y": 1335,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4349,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7af2004a.23f66",\r
+        "id": "a7e92939.08a52",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3780,\r
-        "y": 1031,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3751,\r
+        "y": 1678,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9e8fb92f.dc9c38",\r
+        "id": "25024bed.781cdc",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3800,\r
-        "y": 1128,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3771,\r
+        "y": 1775,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3defc723.7feba8",\r
-                "92e9e56.6323798",\r
-                "92430372.354f08"\r
+                "17a289eb.8378c6",\r
+                "4e86abed.341d6c",\r
+                "9944c222.7ecb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3defc723.7feba8",\r
+        "id": "17a289eb.8378c6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4002.5001220703125,\r
-        "y": 1081,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3973.5001220703125,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "38216362.304eb4"\r
+                "2250bf3f.3fcd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92e9e56.6323798",\r
+        "id": "4e86abed.341d6c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3994.5001220703125,\r
-        "y": 1136,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3965.5001220703125,\r
+        "y": 1783,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "48eafe9b.93564"\r
+                "7fe7998e.7db16"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38216362.304eb4",\r
+        "id": "2250bf3f.3fcd88",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4146.8824462890625,\r
-        "y": 1078.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4117.8824462890625,\r
+        "y": 1725.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5738b986.eff058"\r
+                "19367b54.5d4395"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5738b986.eff058",\r
+        "id": "19367b54.5d4395",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4331,\r
-        "y": 1093,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4302,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "424cd2de.fa894c"\r
+                "e137d17b.53afd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92430372.354f08",\r
+        "id": "9944c222.7ecb4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3999.5001220703125,\r
-        "y": 1193,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3970.5001220703125,\r
+        "y": 1840,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "93dd1d01.b545d"\r
+                "c7e8bb41.e69fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93dd1d01.b545d",\r
+        "id": "c7e8bb41.e69fc8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4151.5001220703125,\r
-        "y": 1194,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4122.5001220703125,\r
+        "y": 1841,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48eafe9b.93564",\r
+        "id": "7fe7998e.7db16",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4162.5001220703125,\r
-        "y": 1139,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4133.5001220703125,\r
+        "y": 1786,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "38af15c1.7d84ba",\r
+        "id": "18a3ba34.8443fe",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4729,\r
-        "y": 1097,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4700,\r
+        "y": 1744,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d8eb3cd4.227208"\r
+                "cca686b1.a86b48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "424cd2de.fa894c",\r
+        "id": "e137d17b.53afd",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4526,\r
-        "y": 1093,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4497,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "38af15c1.7d84ba"\r
+                "18a3ba34.8443fe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9c07a83.518f98",\r
+        "id": "ec259c93.12e46",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5114,\r
-        "y": 1096,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5085,\r
+        "y": 1743,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ef0c3c57.987338",\r
-                "56343453.6f0ce4",\r
-                "3b68871e.15bfe"\r
+                "cf9d2f3.18e805",\r
+                "1901d45c.9387cc",\r
+                "86a361e1.5f9008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d8eb3cd4.227208",\r
+        "id": "cca686b1.a86b48",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4906,\r
-        "y": 1089,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4877,\r
+        "y": 1736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f04e0884.6fcbb8",\r
-                "a9c07a83.518f98"\r
+                "2d219530.71913a",\r
+                "ec259c93.12e46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f04e0884.6fcbb8",\r
+        "id": "2d219530.71913a",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5144,\r
-        "y": 1044,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5115,\r
+        "y": 1691,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b02d57da.181518",\r
+        "id": "bb17bcb1.afece8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5473,\r
-        "y": 1200,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5444,\r
+        "y": 1847,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fed20348.5bb418",\r
+        "id": "e71302c9.0e3fc8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5484,\r
-        "y": 1145,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5455,\r
+        "y": 1792,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63aaed6a.7bdac4",\r
+        "id": "c367d2df.137348",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5468.38232421875,\r
-        "y": 1084.6556701660156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5439.38232421875,\r
+        "y": 1731.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "75824df.2d8fab4"\r
+                "bfc16252.e05aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75824df.2d8fab4",\r
+        "id": "bfc16252.e05aa",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5683,\r
-        "y": 1081,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5654,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef0c3c57.987338",\r
+        "id": "cf9d2f3.18e805",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5324,\r
-        "y": 1087,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5295,\r
+        "y": 1734,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "63aaed6a.7bdac4"\r
+                "c367d2df.137348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56343453.6f0ce4",\r
+        "id": "1901d45c.9387cc",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5316,\r
-        "y": 1142,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5287,\r
+        "y": 1789,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "fed20348.5bb418"\r
+                "e71302c9.0e3fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b68871e.15bfe",\r
+        "id": "86a361e1.5f9008",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5321,\r
-        "y": 1199,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 5292,\r
+        "y": 1846,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b02d57da.181518"\r
+                "bb17bcb1.afece8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d3714db.b7aad4",\r
+        "id": "5afc15bc.b14b2c",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1838,\r
-        "y": 453,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 1824,\r
+        "y": 450,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ff6cd3bd.d426f",\r
-                "64ede831.c277d",\r
-                "c3e64c55.d790f8"\r
+                "c4ea2f12.0682f8",\r
+                "89ba984f.fbff08",\r
+                "4c31ddac.b140a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff6cd3bd.d426f",\r
+        "id": "c4ea2f12.0682f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2046,\r
-        "y": 417,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2032,\r
+        "y": 414,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ab398477.a58648"\r
+                "207f18a3.1780c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64ede831.c277d",\r
+        "id": "89ba984f.fbff08",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2046.490966796875,\r
-        "y": 462.57403564453125,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2032.490966796875,\r
+        "y": 459.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "575d4e0a.5d761"\r
+                "db0bb70b.5af75"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3e64c55.d790f8",\r
+        "id": "4c31ddac.b140a4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2044,\r
-        "y": 506,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2030,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b99b7bb3.94d958"\r
+                "34efc961.392a36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "575d4e0a.5d761",\r
+        "id": "db0bb70b.5af75",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2209.0623779296875,\r
-        "y": 462.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2195.0623779296875,\r
+        "y": 459.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b99b7bb3.94d958",\r
+        "id": "34efc961.392a36",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2213,\r
-        "y": 507,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2199,\r
+        "y": 504,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "684f9a1f.f6246c",\r
+        "id": "da2f8124.076ab8",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2519,\r
-        "y": 506,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2505,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7a997c1a.ca4d0c",\r
-                "5d76d89f.d221e",\r
-                "d47edd7.a73b9a"\r
+                "28f88824.b7c4b8",\r
+                "d6ad8583.7ca128",\r
+                "c9e967f5.e899f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11f43428.ee3774",\r
+        "id": "f459c148.932bf8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2903,\r
-        "y": 506,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2885,\r
+        "y": 591,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "9d8c4947.e731c",\r
-                "a3bb6162.8aa1a8"\r
+                "1c6e3351.8ccb0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a997c1a.ca4d0c",\r
+        "id": "28f88824.b7c4b8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2730,\r
-        "y": 508,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2716,\r
+        "y": 592,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "11f43428.ee3774"\r
+                "f459c148.932bf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d76d89f.d221e",\r
+        "id": "d6ad8583.7ca128",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2730.490966796875,\r
-        "y": 553.5740356445312,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2718.490966796875,\r
+        "y": 487.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "38cca479.139cac"\r
+                "ef5820a6.09d9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d47edd7.a73b9a",\r
+        "id": "c9e967f5.e899f8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2728,\r
-        "y": 597,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2714,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3c7730a0.80743"\r
+                "bd9d5fad.2d262"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c7730a0.80743",\r
+        "id": "bd9d5fad.2d262",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2895,\r
-        "y": 596,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2882,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "38cca479.139cac",\r
+        "id": "ef5820a6.09d9d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2893.0623779296875,\r
-        "y": 553.8597717285156,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2881.0625,\r
+        "y": 486.8597412109375,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab398477.a58648",\r
+        "id": "207f18a3.1780c8",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2247,\r
-        "y": 412,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2233,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "32748804.ce58a"\r
+                "208bed02.1187fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32748804.ce58a",\r
+        "id": "208bed02.1187fa",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2452,\r
-        "y": 412,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2438,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "41c73b96.f41a84"\r
+                "f005e0a8.cc7dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41c73b96.f41a84",\r
+        "id": "f005e0a8.cc7dc8",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2618,\r
-        "y": 412,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2604,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "cfeba90.49ffe58"\r
+                "51d187ad.ad3078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cfeba90.49ffe58",\r
+        "id": "51d187ad.ad3078",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2781,\r
-        "y": 412,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2767,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "684f9a1f.f6246c",\r
-                "b9f32cf4.c94178"\r
+                "da2f8124.076ab8",\r
+                "1e447cc1.915cb3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d8c4947.e731c",\r
+        "id": "aecb0c53.70b3e8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3157,\r
-        "y": 505,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3326,\r
+        "y": 692,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "c705e3fd.e27bf",\r
-                "74e33b9a.6a3ba4"\r
+                "45f40514.0a111c",\r
+                "e5457af4.842818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c705e3fd.e27bf",\r
+        "id": "45f40514.0a111c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3410,\r
-        "y": 539,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3540,\r
+        "y": 729,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ab5b6203.69a998"\r
+                "4c5d5e83.4b55d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74e33b9a.6a3ba4",\r
+        "id": "e5457af4.842818",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3410,\r
-        "y": 483,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3542,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7b04fd35.ba570c"\r
+                "d204a9f5.cb1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab5b6203.69a998",\r
+        "id": "4c5d5e83.4b55d8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3149,\r
-        "y": 1325,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3120,\r
+        "y": 1972,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "15797e4.5eae102",\r
-                "55009f8b.9fdc5"\r
+                "e25a0aae.dc3b6",\r
+                "5811aab2.c9cdb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15797e4.5eae102",\r
+        "id": "e25a0aae.dc3b6",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1359,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3373,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "4151c132.8e3c28"\r
+                "e2283676.c05cf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55009f8b.9fdc5",\r
+        "id": "5811aab2.c9cdb4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1303,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3373,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "db74d7f2.74d0f8"\r
+                "5f1f11a6.4b622"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4151c132.8e3c28",\r
+        "id": "e2283676.c05cf8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3553,\r
-        "y": 1359,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3524,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad6a538e.8b5998",\r
+        "id": "ef6002a3.a9265",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 3856,\r
-        "y": 110,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4400,\r
+        "y": 104,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51807068.f4c68",\r
+        "id": "d11d0786.01d8c8",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3837,\r
-        "y": 916,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3808,\r
+        "y": 1563,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b04fd35.ba570c",\r
+        "id": "4923e79.d3d2a98",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3578,\r
-        "y": 485,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4091,\r
+        "y": 361,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ad6a538e.8b5998",\r
-                "3d56fd4f.8da4ea",\r
-                "5074df67.2ba988",\r
-                "9fd13730.014208",\r
-                "ab834e.f483fcb",\r
-                "c9d60073.e2df48",\r
-                "119d7057.187e9"\r
+                "ef6002a3.a9265",\r
+                "73d91f0d.979448",\r
+                "cdb19fe7.3fcc18",\r
+                "83225463.070fc",\r
+                "b72def38.869578",\r
+                "61d206ce.c84cc",\r
+                "53d5aef.e4ebbd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db74d7f2.74d0f8",\r
+        "id": "5f1f11a6.4b622",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3553,\r
-        "y": 1302,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3524,\r
+        "y": 1949,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "51807068.f4c68",\r
-                "b8f0eb5.a171218",\r
-                "7af2004a.23f66",\r
-                "9e8fb92f.dc9c38",\r
-                "d94b849.7fdac78",\r
-                "f91c20c6.244a28",\r
-                "158d95b4.dbf02a"\r
+                "d11d0786.01d8c8",\r
+                "fec1365a.907b4",\r
+                "a7e92939.08a52",\r
+                "25024bed.781cdc",\r
+                "eb21cc8f.003df8",\r
+                "1be8ac25.0620fc",\r
+                "6fb79d87.420834"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f91c20c6.244a28",\r
+        "id": "1be8ac25.0620fc",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3782,\r
-        "y": 1445,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3753,\r
+        "y": 2092,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "158d95b4.dbf02a",\r
+        "id": "6fb79d87.420834",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3936,\r
-        "y": 1493,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3907,\r
+        "y": 2140,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7e8ddb70.effbcc",\r
-                "8eaa1ef7.3644e"\r
+                "6175c964.8889d",\r
+                "add709ae.0740f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e8ddb70.effbcc",\r
+        "id": "6175c964.8889d",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4281.5,\r
-        "y": 1474,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4252.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "596967d4.0f4de8"\r
+                "7caa2ba7.6bf4dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8eaa1ef7.3644e",\r
+        "id": "add709ae.0740f",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4285.5,\r
-        "y": 1514,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4256.5,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "4f294e9d.697c08"\r
+                "43eb2ee.41b33d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "596967d4.0f4de8",\r
+        "id": "7caa2ba7.6bf4dc",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4439.5,\r
-        "y": 1474,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4410.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4f294e9d.697c08",\r
+        "id": "43eb2ee.41b33d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4443,\r
-        "y": 1514,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4414,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "637a80dd.df05",\r
-                "d2c33ee2.7a3708"\r
+                "30f33337.055d14",\r
+                "948532eb.e6c7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78a845.7bb187bc",\r
+        "id": "bc6f9b2b.7321f",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3779.5,\r
-        "y": 1401,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3750.5,\r
+        "y": 2048,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "637a80dd.df05",\r
+        "id": "30f33337.055d14",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "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": 4783,\r
-        "y": 1513,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4754,\r
+        "y": 2160,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88ec2f6d.8d5da",\r
+        "id": "227afae6.b4c94e",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4641,\r
-        "y": 1471,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4612,\r
+        "y": 2118,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d2c33ee2.7a3708",\r
+        "id": "948532eb.e6c7c",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4712,\r
-        "y": 1562,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 4683,\r
+        "y": 2209,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a3bb6162.8aa1a8",\r
+        "id": "55624da8.df976c",\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": 3144,\r
-        "y": 411,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 3317,\r
+        "y": 632,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9f32cf4.c94178",\r
+        "id": "1e447cc1.915cb3",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
          "comments": "",\r
-        "x": 2965,\r
-        "y": 283,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 2951,\r
+        "y": 280,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f396e52b.35559",\r
+        "type": "comment",\r
+        "name": "only dst ttp exists. No src",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3912,\r
+        "y": 318,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "72b06eec.578eb8",\r
+        "type": "comment",\r
+        "name": "only src ttp exists. No dst",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3469,\r
+        "y": 1896,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d204a9f5.cb1f",\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": 3648,\r
+        "y": 480,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "7da55af.10937a4",\r
+                "d30ba4e8.997a68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d30ba4e8.997a68",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3890,\r
+        "y": 1069,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "b0909b7a.d37638"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7da55af.10937a4",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3884,\r
+        "y": 360,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "4923e79.d3d2a98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b0909b7a.d37638",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4048,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "aadf2b5c.a1838",\r
+                "8fb5b52a.4e2ae",\r
+                "a006da1c.c23038",\r
+                "7e67d000.77abb",\r
+                "23d1e7d8.976258"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8fb5b52a.4e2ae",\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": 4312,\r
+        "y": 951,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "23d1e7d8.976258",\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": 4393,\r
+        "y": 1266,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c8d598bd.cbc8e",\r
+                "c93ae11e.1c54c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8d598bd.cbc8e",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4702.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "a086276f.4222f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c93ae11e.1c54c8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4707.5,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "51323b7.caecec4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a086276f.4222f8",\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": 4878.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "51323b7.caecec4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4874,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a006da1c.c23038",\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": 4250,\r
+        "y": 999,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67d000.77abb",\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": 4276,\r
+        "y": 1116,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ec2bb2c1.50dad",\r
+                "6fe2c398.ccd7b4",\r
+                "2cf209f9.a94e2e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ec2bb2c1.50dad",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4471.5001220703125,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "e5c84b9e.98975"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6fe2c398.ccd7b4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4463.5001220703125,\r
+        "y": 1123,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "be59a3.0881066"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5c84b9e.98975",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4615.8824462890625,\r
+        "y": 1067.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "40635ccb.0881a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "40635ccb.0881a4",\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": 4800,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ff02a9b.ff8ffd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ff02a9b.ff8ffd8",\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": 4995,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d3d180f4.36fa68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2cf209f9.a94e2e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4468.5001220703125,\r
+        "y": 1180,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "2b5a1252.216fe6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2b5a1252.216fe6",\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": 4620.5001220703125,\r
+        "y": 1181,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "be59a3.0881066",\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": 4631.5001220703125,\r
+        "y": 1124,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "aadf2b5c.a1838",\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": 4307,\r
+        "y": 891,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d3d180f4.36fa68",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5198,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "8355bb98.2142e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d998285a.8338c",\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": 5583,\r
+        "y": 1083,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "38daac86.dbf464",\r
+                "21dc6947.7d9bae",\r
+                "a47aca30.5160e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8355bb98.2142e8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5377,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "583e9682.750428",\r
+                "d998285a.8338c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "583e9682.750428",\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": 5613,\r
+        "y": 1031,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "38daac86.dbf464",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5793,\r
+        "y": 1074,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "10b34ad5.e58d9d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "21dc6947.7d9bae",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5785,\r
+        "y": 1129,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "6ce9bc65.05009c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a47aca30.5160e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5790,\r
+        "y": 1186,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "18239e9b.852729"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "18239e9b.852729",\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": 5942,\r
+        "y": 1187,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6ce9bc65.05009c",\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": 5953,\r
+        "y": 1132,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10b34ad5.e58d9d",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5937.38232421875,\r
+        "y": 1071.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d4058b68.bd8818"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4058b68.bd8818",\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": 6152,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3a09f359.556f04",\r
+        "type": "comment",\r
+        "name": "both src and dst exist",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3926,\r
+        "y": 1009,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1c6e3351.8ccb0d",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
+        "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2488,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "91c41639.2357b",\r
+                "5aa31f25.4b2718"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5aa31f25.4b2718",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 754,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "49ef7599.6e682c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91c41639.2357b",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 699,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c7ffb45b.775578"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c7ffb45b.775578",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3051,\r
+        "y": 697,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "55624da8.df976c",\r
+                "aecb0c53.70b3e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49ef7599.6e682c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3028,\r
+        "y": 755,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file