Bug fixing required for integration testing with PCE.

[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..02a760d 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": "acf9e544.d632d8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 156,\r
-        "y": 95,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 130,\r
+        "y": 80,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "90741178.637a68"\r
+                "ca913714.8e299"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90741178.637a68",\r
+        "id": "ca913714.8e299",\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": 261.2856903076172,\r
+        "y": 129.23810863494873,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e9aee376.235818"\r
+                "fb417168.600308"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9aee376.235818",\r
+        "id": "fb417168.600308",\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": 264.4286193847656,\r
+        "y": 214.00003242492676,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9c8b5d20.5b6ef8"\r
+                "b8f0421e.565ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c8b5d20.5b6ef8",\r
+        "id": "b8f0421e.565ff8",\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": 414.238037109375,\r
+        "y": 343.6666564941406,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f1c1dc9b.59851",\r
-                "40fee6aa.417918",\r
-                "a3f28ac6.d30ed8"\r
+                "77ab8d82.d7040c",\r
+                "161b3712.e40a99",\r
+                "441438f3.47d108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1c1dc9b.59851",\r
+        "id": "77ab8d82.d7040c",\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": 682.5716552734375,\r
+        "y": 730.59716796875,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e4fd4d94.2b8ec8",\r
+        "id": "cd3b0e66.721858",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 740,\r
-        "y": 420,\r
-        "z": "8a9c455f.82beb8",\r
+        "x": 714,\r
+        "y": 405,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40fee6aa.417918",\r
+        "id": "161b3712.e40a99",\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": 734,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "15f2cda7.88709a",\r
-                "187b249d.3c85cb",\r
-                "c12e657e.e2c7f8"\r
+                "a50bfd24.6ac44",\r
+                "3bd3a68e.896b3a",\r
+                "320764b6.9fa15c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15f2cda7.88709a",\r
+        "id": "a50bfd24.6ac44",\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": 953,\r
+        "y": 439,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "56c6117d.ed7bc"\r
+                "b122e042.5ab94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "187b249d.3c85cb",\r
+        "id": "3bd3a68e.896b3a",\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": 962.490966796875,\r
+        "y": 481.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "dd3e3cac.482ca8"\r
+                "4e666373.42b6cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c12e657e.e2c7f8",\r
+        "id": "320764b6.9fa15c",\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": 951,\r
+        "y": 528,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d7bbbdd4.b85c7"\r
+                "422b64b3.e06004"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd3e3cac.482ca8",\r
+        "id": "4e666373.42b6cc",\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": 1116.0623779296875,\r
+        "y": 484.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d7bbbdd4.b85c7",\r
+        "id": "422b64b3.e06004",\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": 1120,\r
+        "y": 529,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "56c6117d.ed7bc",\r
+        "id": "b122e042.5ab94",\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": 1150,\r
+        "y": 435,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "68f0da0a.13a494"\r
+                "111942fe.354315"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "68f0da0a.13a494",\r
+        "id": "111942fe.354315",\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": 1373.33349609375,\r
+        "y": 434.99993896484375,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a37a9810.801788"\r
+                "ff15f851.7a7528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a37a9810.801788",\r
+        "id": "ff15f851.7a7528",\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": 1574.0001335144043,\r
+        "y": 436.00002098083496,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2d3714db.b7aad4"\r
+                "cf901b65.835fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d56fd4f.8da4ea",\r
+        "id": "72376cd1.cdcaec",\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": 4393,\r
+        "y": 152,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "119d7057.187e9",\r
+        "id": "2a89aa53.8890b6",\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": 4474,\r
+        "y": 467,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a078109.a1f9bf",\r
-                "c205f5c4.0bdb88"\r
+                "40316706.17eb48",\r
+                "6c473f1b.946a08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a078109.a1f9bf",\r
+        "id": "40316706.17eb48",\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": 4783.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3b38ca16.a7fb4e"\r
+                "aea69973.33e85"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c205f5c4.0bdb88",\r
+        "id": "6c473f1b.946a08",\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": 4788.5,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "176e9242.258856"\r
+                "d21a082d.2cad68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b38ca16.a7fb4e",\r
+        "id": "aea69973.33e85",\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": 4959.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "176e9242.258856",\r
+        "id": "d21a082d.2cad68",\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": 4955,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ab834e.f483fcb",\r
+        "id": "de94f6d4.eda0e",\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": 4340.5,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9d60073.e2df48",\r
+        "id": "342bfbf3.ee642c",\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": 4494.5,\r
+        "y": 703,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1e624148.f51b17",\r
-                "9b38443d.36a338"\r
+                "8236b8ec.5fd17",\r
+                "51c5e2c3.871744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e624148.f51b17",\r
+        "id": "8236b8ec.5fd17",\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": 4840,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "20712318.8d32fc"\r
+                "b89e8953.c6ac88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b38443d.36a338",\r
+        "id": "51c5e2c3.871744",\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": 4844,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a4fdbce9.b1c4"\r
+                "933ba47e.14e65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20712318.8d32fc",\r
+        "id": "b89e8953.c6ac88",\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": 4998,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fdbce9.b1c4",\r
+        "id": "933ba47e.14e65",\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": 5001.5,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f9579fb7.928158",\r
-                "b5483433.ff3288"\r
+                "363131ab.be28b6",\r
+                "fcee3485.dea4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "320ccbea.c02274",\r
+        "id": "776cbd7.844f0c4",\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": 4338,\r
+        "y": 611,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9579fb7.928158",\r
+        "id": "363131ab.be28b6",\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": 5332,\r
+        "y": 689,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d3281524.0d8478",\r
+        "id": "d8ba5ee6.a5736",\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": 5196,\r
+        "y": 648,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5483433.ff3288",\r
+        "id": "fcee3485.dea4a",\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": 5259,\r
+        "y": 735,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5074df67.2ba988",\r
+        "id": "9b9c3cba.716c78",\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": 4331,\r
+        "y": 200,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fd13730.014208",\r
+        "id": "5f8cf8c6.3002c8",\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": 4357,\r
+        "y": 317,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e11a5ea7.685f28",\r
-                "6cb0b7a8.80c24",\r
-                "a90c44f8.bdb148"\r
+                "33823e1a.9269c2",\r
+                "b38b9e38.f8c8a8",\r
+                "9f21383a.68cb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e11a5ea7.685f28",\r
+        "id": "33823e1a.9269c2",\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": 4552.5001220703125,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "dfb8903c.c1b1d8"\r
+                "755b5bf3.347744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6cb0b7a8.80c24",\r
+        "id": "b38b9e38.f8c8a8",\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": 4544.5001220703125,\r
+        "y": 324,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "509847ff.264c58"\r
+                "5d1291bc.3b9d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfb8903c.c1b1d8",\r
+        "id": "755b5bf3.347744",\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": 4696.8824462890625,\r
+        "y": 268.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "22c6d630.71326a"\r
+                "5007d6bb.a571d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e775dc4.42bfbc",\r
+        "id": "c0da9575.eb2c6",\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": 5279,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f76a815f.36c178"\r
+                "1053f3a3.2846c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22c6d630.71326a",\r
+        "id": "5007d6bb.a571d",\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": 4881,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a3e1c0eb.9f5f88"\r
+                "33b94d0d.c61ee2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3e1c0eb.9f5f88",\r
+        "id": "33b94d0d.c61ee2",\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": 5076,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5e775dc4.42bfbc"\r
+                "c0da9575.eb2c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a90c44f8.bdb148",\r
+        "id": "9f21383a.68cb9",\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": 4549.5001220703125,\r
+        "y": 381,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7a5f3123.aad6e8"\r
+                "e621d08a.7d07a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a5f3123.aad6e8",\r
+        "id": "e621d08a.7d07a8",\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": 4701.5001220703125,\r
+        "y": 382,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "509847ff.264c58",\r
+        "id": "5d1291bc.3b9d5",\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": 4712.5001220703125,\r
+        "y": 325,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ab5c9a1.06e3f",\r
+        "id": "bace4f35.dcb4f",\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": 5664,\r
+        "y": 284,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "73f9ea02.2fb1e4",\r
-                "f8008145.65a48",\r
-                "81ec8b7a.5856d8"\r
+                "41428f.b99c7d7",\r
+                "92b16ebc.198be8",\r
+                "47593c0a.609b2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f76a815f.36c178",\r
+        "id": "1053f3a3.2846c4",\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": 5458,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ba856b81.43ed78",\r
-                "4ab5c9a1.06e3f"\r
+                "db2fdd1f.f44e1",\r
+                "bace4f35.dcb4f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba856b81.43ed78",\r
+        "id": "db2fdd1f.f44e1",\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": 5694,\r
+        "y": 232,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f9ea02.2fb1e4",\r
+        "id": "41428f.b99c7d7",\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": 5874,\r
+        "y": 275,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5955dc9c.10f754"\r
+                "d8c57966.bba2b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8008145.65a48",\r
+        "id": "92b16ebc.198be8",\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": 5866,\r
+        "y": 330,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e3286b6.68c7618"\r
+                "bbecf65b.0991f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81ec8b7a.5856d8",\r
+        "id": "47593c0a.609b2c",\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": 5871,\r
+        "y": 387,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ecd34f94.c447e"\r
+                "17aa566c.ce27ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ecd34f94.c447e",\r
+        "id": "17aa566c.ce27ba",\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": 6023,\r
+        "y": 388,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e3286b6.68c7618",\r
+        "id": "bbecf65b.0991f",\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": 6034,\r
+        "y": 333,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5955dc9c.10f754",\r
+        "id": "d8c57966.bba2b8",\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": 6018.38232421875,\r
+        "y": 272.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "adf5d068.f7cc"\r
+                "eeaaed9f.46288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adf5d068.f7cc",\r
+        "id": "eeaaed9f.46288",\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": 6233,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3f28ac6.d30ed8",\r
+        "id": "441438f3.47d108",\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": 700,\r
+        "y": 449,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b8f0eb5.a171218",\r
+        "id": "48e88b1.fd2c9f4",\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": 3800,\r
+        "y": 1609,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d94b849.7fdac78",\r
+        "id": "46863424.f49acc",\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": 3863,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bfb79ead.715e28",\r
-                "d50b4560.d85de8"\r
+                "dcc57379.86dfe8",\r
+                "c898077c.fa069"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfb79ead.715e28",\r
+        "id": "dcc57379.86dfe8",\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": 4158.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3d3c3af3.12a3b6"\r
+                "abcd166d.ac4418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d50b4560.d85de8",\r
+        "id": "c898077c.fa069",\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": 4163.5,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "347f5539.8f6cd2"\r
+                "a337c775.425078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d3c3af3.12a3b6",\r
+        "id": "abcd166d.ac4418",\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": 4326.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "347f5539.8f6cd2",\r
+        "id": "a337c775.425078",\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": 4337,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7af2004a.23f66",\r
+        "id": "402d5da7.084ecc",\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": 3739,\r
+        "y": 1666,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9e8fb92f.dc9c38",\r
+        "id": "600572d7.37f4f4",\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": 3759,\r
+        "y": 1763,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3defc723.7feba8",\r
-                "92e9e56.6323798",\r
-                "92430372.354f08"\r
+                "a75ca9d.3439f58",\r
+                "399b40eb.8cb2c",\r
+                "c23ae6cb.c49a18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3defc723.7feba8",\r
+        "id": "a75ca9d.3439f58",\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": 3961.5001220703125,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "38216362.304eb4"\r
+                "7c251cdc.702f24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92e9e56.6323798",\r
+        "id": "399b40eb.8cb2c",\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": 3953.5001220703125,\r
+        "y": 1771,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "48eafe9b.93564"\r
+                "9ad884c8.666098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38216362.304eb4",\r
+        "id": "7c251cdc.702f24",\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": 4105.8824462890625,\r
+        "y": 1713.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5738b986.eff058"\r
+                "cb9eeb5b.e8a49"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5738b986.eff058",\r
+        "id": "cb9eeb5b.e8a49",\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": 4290,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "424cd2de.fa894c"\r
+                "3d062c6c.6ff5d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92430372.354f08",\r
+        "id": "c23ae6cb.c49a18",\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": 3958.5001220703125,\r
+        "y": 1828,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "93dd1d01.b545d"\r
+                "c325aab2.4755e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93dd1d01.b545d",\r
+        "id": "c325aab2.4755e",\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": 4110.5001220703125,\r
+        "y": 1829,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48eafe9b.93564",\r
+        "id": "9ad884c8.666098",\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": 4121.5001220703125,\r
+        "y": 1774,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "38af15c1.7d84ba",\r
+        "id": "34bca75e.e09988",\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": 4688,\r
+        "y": 1732,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d8eb3cd4.227208"\r
+                "edc0cd69.586d38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "424cd2de.fa894c",\r
+        "id": "3d062c6c.6ff5d4",\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": 4485,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "38af15c1.7d84ba"\r
+                "34bca75e.e09988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9c07a83.518f98",\r
+        "id": "f5373d88.e0f4c",\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": 5073,\r
+        "y": 1731,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ef0c3c57.987338",\r
-                "56343453.6f0ce4",\r
-                "3b68871e.15bfe"\r
+                "efe05c93.e4bd48",\r
+                "c004c915.8de7",\r
+                "8875f4b.bcb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d8eb3cd4.227208",\r
+        "id": "edc0cd69.586d38",\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": 4865,\r
+        "y": 1724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f04e0884.6fcbb8",\r
-                "a9c07a83.518f98"\r
+                "bd388c7d.2a51e",\r
+                "f5373d88.e0f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f04e0884.6fcbb8",\r
+        "id": "bd388c7d.2a51e",\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": 5103,\r
+        "y": 1679,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b02d57da.181518",\r
+        "id": "c54d67f1.3a38c8",\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": 5432,\r
+        "y": 1835,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fed20348.5bb418",\r
+        "id": "56448bab.caa82c",\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": 5443,\r
+        "y": 1780,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63aaed6a.7bdac4",\r
+        "id": "97f3ba34.f2dc7",\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": 5427.38232421875,\r
+        "y": 1719.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "75824df.2d8fab4"\r
+                "5b487de9.7c9484"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75824df.2d8fab4",\r
+        "id": "5b487de9.7c9484",\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": 5642,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef0c3c57.987338",\r
+        "id": "efe05c93.e4bd48",\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": 5283,\r
+        "y": 1722,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "63aaed6a.7bdac4"\r
+                "97f3ba34.f2dc7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56343453.6f0ce4",\r
+        "id": "c004c915.8de7",\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": 5275,\r
+        "y": 1777,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "fed20348.5bb418"\r
+                "56448bab.caa82c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b68871e.15bfe",\r
+        "id": "8875f4b.bcb6f88",\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": 5280,\r
+        "y": 1834,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b02d57da.181518"\r
+                "c54d67f1.3a38c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d3714db.b7aad4",\r
+        "id": "cf901b65.835fc8",\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": 1812,\r
+        "y": 438,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ff6cd3bd.d426f",\r
-                "64ede831.c277d",\r
-                "c3e64c55.d790f8"\r
+                "a3e158df.aec638",\r
+                "28bc0271.0f9e9e",\r
+                "12a8a0b5.4084c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff6cd3bd.d426f",\r
+        "id": "a3e158df.aec638",\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": 2020,\r
+        "y": 402,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ab398477.a58648"\r
+                "8651df9.9efa52"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64ede831.c277d",\r
+        "id": "28bc0271.0f9e9e",\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": 2020.490966796875,\r
+        "y": 447.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "575d4e0a.5d761"\r
+                "b3859ee9.a63778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3e64c55.d790f8",\r
+        "id": "12a8a0b5.4084c7",\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": 2018,\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b99b7bb3.94d958"\r
+                "b1a3023.979458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "575d4e0a.5d761",\r
+        "id": "b3859ee9.a63778",\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": 2183.0623779296875,\r
+        "y": 447.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b99b7bb3.94d958",\r
+        "id": "b1a3023.979458",\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": 2187,\r
+        "y": 492,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "684f9a1f.f6246c",\r
+        "id": "e921a3d6.75f8b8",\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": 2493,\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7a997c1a.ca4d0c",\r
-                "5d76d89f.d221e",\r
-                "d47edd7.a73b9a"\r
+                "19de242e.79b56c",\r
+                "e1533c2.9fadc4",\r
+                "da41548.4c59da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11f43428.ee3774",\r
+        "id": "108df7f5.f0405",\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": 2873,\r
+        "y": 579,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9d8c4947.e731c",\r
-                "a3bb6162.8aa1a8"\r
+                "19520422.b45d4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a997c1a.ca4d0c",\r
+        "id": "19de242e.79b56c",\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": 2704,\r
+        "y": 580,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "11f43428.ee3774"\r
+                "108df7f5.f0405"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d76d89f.d221e",\r
+        "id": "e1533c2.9fadc4",\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": 2706.490966796875,\r
+        "y": 475.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "38cca479.139cac"\r
+                "efbdd7a3.5958d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d47edd7.a73b9a",\r
+        "id": "da41548.4c59da8",\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": 2702,\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3c7730a0.80743"\r
+                "e03f3a11.4be118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c7730a0.80743",\r
+        "id": "e03f3a11.4be118",\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": 2870,\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "38cca479.139cac",\r
+        "id": "efbdd7a3.5958d8",\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": 2869.0625,\r
+        "y": 474.8597412109375,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab398477.a58648",\r
+        "id": "8651df9.9efa52",\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": 2221,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "32748804.ce58a"\r
+                "6856373e.df8d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32748804.ce58a",\r
+        "id": "6856373e.df8d5",\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": 2426,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "41c73b96.f41a84"\r
+                "61b4f44b.e9282c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41c73b96.f41a84",\r
+        "id": "61b4f44b.e9282c",\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": 2592,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "cfeba90.49ffe58"\r
+                "9aa1bdef.a85148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cfeba90.49ffe58",\r
+        "id": "9aa1bdef.a85148",\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": 2755,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "684f9a1f.f6246c",\r
-                "b9f32cf4.c94178"\r
+                "e921a3d6.75f8b8",\r
+                "8b7a547c.5a78f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d8c4947.e731c",\r
+        "id": "61cd75bc.541bfc",\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": 3314,\r
+        "y": 680,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c705e3fd.e27bf",\r
-                "74e33b9a.6a3ba4"\r
+                "ce7e100e.65e8d8",\r
+                "978d0324.53a218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c705e3fd.e27bf",\r
+        "id": "ce7e100e.65e8d8",\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": 3528,\r
+        "y": 717,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ab5b6203.69a998"\r
+                "d3a9cf8b.6d8898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74e33b9a.6a3ba4",\r
+        "id": "978d0324.53a218",\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": 3530,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7b04fd35.ba570c"\r
+                "eacef09.695731"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab5b6203.69a998",\r
+        "id": "d3a9cf8b.6d8898",\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": 3108,\r
+        "y": 1960,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "15797e4.5eae102",\r
-                "55009f8b.9fdc5"\r
+                "a298a9c0.8f44e8",\r
+                "ca55eca6.1cb808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15797e4.5eae102",\r
+        "id": "a298a9c0.8f44e8",\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": 3361,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4151c132.8e3c28"\r
+                "c785caf0.121d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55009f8b.9fdc5",\r
+        "id": "ca55eca6.1cb808",\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": 3361,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "db74d7f2.74d0f8"\r
+                "6d0b6c95.2359f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4151c132.8e3c28",\r
+        "id": "c785caf0.121d",\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": 3512,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad6a538e.8b5998",\r
+        "id": "2abfc3f7.2295e4",\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": 4388,\r
+        "y": 92,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51807068.f4c68",\r
+        "id": "ebb770b7.bb1a4",\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": 3796,\r
+        "y": 1551,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b04fd35.ba570c",\r
+        "id": "bcb6d938.081b58",\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": 4079,\r
+        "y": 349,\r
+        "z": "4996e636.3ea08",\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
+                "2abfc3f7.2295e4",\r
+                "72376cd1.cdcaec",\r
+                "9b9c3cba.716c78",\r
+                "5f8cf8c6.3002c8",\r
+                "de94f6d4.eda0e",\r
+                "342bfbf3.ee642c",\r
+                "2a89aa53.8890b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db74d7f2.74d0f8",\r
+        "id": "6d0b6c95.2359f4",\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": 3512,\r
+        "y": 1937,\r
+        "z": "4996e636.3ea08",\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
+                "ebb770b7.bb1a4",\r
+                "48e88b1.fd2c9f4",\r
+                "402d5da7.084ecc",\r
+                "600572d7.37f4f4",\r
+                "46863424.f49acc",\r
+                "4aa8bc15.43053c",\r
+                "295ad948.4ab50e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f91c20c6.244a28",\r
+        "id": "4aa8bc15.43053c",\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": 3741,\r
+        "y": 2080,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "158d95b4.dbf02a",\r
+        "id": "295ad948.4ab50e",\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": 3895,\r
+        "y": 2128,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7e8ddb70.effbcc",\r
-                "8eaa1ef7.3644e"\r
+                "ec9bb97a.fa7b4",\r
+                "d7a86063.21272"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e8ddb70.effbcc",\r
+        "id": "ec9bb97a.fa7b4",\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": 4240.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "596967d4.0f4de8"\r
+                "23e4ab97.fe6f5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8eaa1ef7.3644e",\r
+        "id": "d7a86063.21272",\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": 4244.5,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4f294e9d.697c08"\r
+                "3d3a171d.cfa4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "596967d4.0f4de8",\r
+        "id": "23e4ab97.fe6f5c",\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": 4398.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4f294e9d.697c08",\r
+        "id": "3d3a171d.cfa4",\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": 4402,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "637a80dd.df05",\r
-                "d2c33ee2.7a3708"\r
+                "5d084d8a.b2f23c",\r
+                "44dbf2a2.960644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78a845.7bb187bc",\r
+        "id": "ce171a50.073f6",\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": 3738.5,\r
+        "y": 2036,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "637a80dd.df05",\r
+        "id": "5d084d8a.b2f23c",\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": 4742,\r
+        "y": 2148,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88ec2f6d.8d5da",\r
+        "id": "e7b454fe.3b5cb",\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": 4600,\r
+        "y": 2106,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d2c33ee2.7a3708",\r
+        "id": "44dbf2a2.960644",\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": 4671,\r
+        "y": 2197,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a3bb6162.8aa1a8",\r
+        "id": "dcf1d309.aad128",\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": 3305,\r
+        "y": 620,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9f32cf4.c94178",\r
+        "id": "8b7a547c.5a78f8",\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": 2939,\r
+        "y": 268,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "29539dcf.178a92",\r
+        "type": "comment",\r
+        "name": "only dst ttp exists. No src",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3900,\r
+        "y": 306,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5f3074d9.b389cc",\r
+        "type": "comment",\r
+        "name": "only src ttp exists. No dst",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3457,\r
+        "y": 1884,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "eacef09.695731",\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": 3636,\r
+        "y": 468,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "f62c1164.a0b8",\r
+                "81b54f08.97d86"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "81b54f08.97d86",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3878,\r
+        "y": 1057,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "efc62266.57c198"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f62c1164.a0b8",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3872,\r
+        "y": 348,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "bcb6d938.081b58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "efc62266.57c198",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4036,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "cb6a953c.fa71e8",\r
+                "263d4572.ce34fa",\r
+                "2e78dd82.d5612a",\r
+                "c61e9a44.c762a8",\r
+                "8ae64ab7.a00a7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "263d4572.ce34fa",\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": 4300,\r
+        "y": 939,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8ae64ab7.a00a7",\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": 4381,\r
+        "y": 1254,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "bd008f9d.f02308",\r
+                "91d1e4e0.3cbb38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bd008f9d.f02308",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4690.5,\r
+        "y": 1223,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "270fab9f.26c71c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91d1e4e0.3cbb38",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4695.5,\r
+        "y": 1288,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "49e9447.128b63c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "270fab9f.26c71c",\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": 4866.5,\r
+        "y": 1223,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "49e9447.128b63c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4862,\r
+        "y": 1288,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e78dd82.d5612a",\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": 4238,\r
+        "y": 987,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c61e9a44.c762a8",\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": 4264,\r
+        "y": 1104,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "58640478.1eeefc",\r
+                "b15b9e00.631398",\r
+                "c5141964.109468"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "58640478.1eeefc",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4459.5001220703125,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "9ec63af5.4a1a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b15b9e00.631398",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4451.5001220703125,\r
+        "y": 1111,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "a4b9d6d5.39a2c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9ec63af5.4a1a88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4603.8824462890625,\r
+        "y": 1055.6556701660156,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "f086ebfd.c8405"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f086ebfd.c8405",\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": 4788,\r
+        "y": 1054,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "b709cf8e.43e148"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b709cf8e.43e148",\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": 4983,\r
+        "y": 1054,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "ad439d36.0ced9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c5141964.109468",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4456.5001220703125,\r
+        "y": 1168,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "56d134ff.8e34ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "56d134ff.8e34ec",\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": 4608.5001220703125,\r
+        "y": 1169,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a4b9d6d5.39a2c8",\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": 4619.5001220703125,\r
+        "y": 1112,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb6a953c.fa71e8",\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": 4295,\r
+        "y": 879,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ad439d36.0ced9",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5186,\r
+        "y": 1058,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "cb537ad7.8928d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e839cea.58e4f3",\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": 5571,\r
+        "y": 1071,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "9673ee8e.826088",\r
+                "87202e49.7cf198",\r
+                "ad5371c2.88c47"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cb537ad7.8928d8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5365,\r
+        "y": 1058,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "2fa33243.987c8e",\r
+                "e839cea.58e4f3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2fa33243.987c8e",\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": 5601,\r
+        "y": 1019,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9673ee8e.826088",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5781,\r
+        "y": 1062,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "3788c181.11c43e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "87202e49.7cf198",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5773,\r
+        "y": 1117,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "3691dbb8.1b2bf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ad5371c2.88c47",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5778,\r
+        "y": 1174,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "c7f3058f.182658"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c7f3058f.182658",\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": 5930,\r
+        "y": 1175,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3691dbb8.1b2bf4",\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": 5941,\r
+        "y": 1120,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3788c181.11c43e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5925.38232421875,\r
+        "y": 1059.6556701660156,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "a3c8eb2b.95af8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3c8eb2b.95af8",\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": 6140,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2ac9f039.bfa9a8",\r
+        "type": "comment",\r
+        "name": "both src and dst exist",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3914,\r
+        "y": 997,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "19520422.b45d4c",\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": 2476,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "fc6dfa43.dee44",\r
+                "90381d7.56caa6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90381d7.56caa6",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2883,\r
+        "y": 742,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "d486bdc8.981f98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fc6dfa43.dee44",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2883,\r
+        "y": 687,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "7563c99.56d39b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7563c99.56d39b8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3039,\r
+        "y": 685,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            [\r
+                "dcf1d309.aad128",\r
+                "61cd75bc.541bfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d486bdc8.981f98",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3016,\r
+        "y": 743,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file