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 9ffaaf7..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": "d3bb30c4.60fa",\r
+        "id": "acf9e544.d632d8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
          "x": 130,\r
-        "y": 87,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 80,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d58b4202.9cdb3"\r
+                "ca913714.8e299"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d58b4202.9cdb3",\r
+        "id": "ca913714.8e299",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -23,1714 +23,2325 @@
          "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": 261.2856903076172,\r
-        "y": 136.23810863494873,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 129.23810863494873,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "617bde2e.1132b"\r
+                "fb417168.600308"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "617bde2e.1132b",\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": 264.4286193847656,\r
-        "y": 221.00003242492676,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 214.00003242492676,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "8ac7a60e.72d768"\r
+                "b8f0421e.565ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ac7a60e.72d768",\r
+        "id": "b8f0421e.565ff8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 414.238037109375,\r
-        "y": 350.6666564941406,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 343.6666564941406,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "72b21bde.5e8f94",\r
-                "9fe7f5eb.e26c6",\r
-                "9bca10ea.41532"\r
+                "77ab8d82.d7040c",\r
+                "161b3712.e40a99",\r
+                "441438f3.47d108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "72b21bde.5e8f94",\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": 682.5716552734375,\r
-        "y": 737.59716796875,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 730.59716796875,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "441fc399.08ca9c",\r
+        "id": "cd3b0e66.721858",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
          "x": 714,\r
-        "y": 412,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 405,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fe7f5eb.e26c6",\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": 734,\r
-        "y": 508,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "926c12ae.af2a48",\r
-                "5deb4cbf.60b5f4",\r
-                "35c77549.8e65c2"\r
+                "a50bfd24.6ac44",\r
+                "3bd3a68e.896b3a",\r
+                "320764b6.9fa15c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "926c12ae.af2a48",\r
+        "id": "a50bfd24.6ac44",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 953,\r
-        "y": 446,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 439,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c296586e.046f08"\r
+                "b122e042.5ab94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5deb4cbf.60b5f4",\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": 962.490966796875,\r
-        "y": 488.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 481.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bb46ff52.717af8"\r
+                "4e666373.42b6cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35c77549.8e65c2",\r
+        "id": "320764b6.9fa15c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 951,\r
-        "y": 535,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 528,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "236d61d5.47d9a6"\r
+                "422b64b3.e06004"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb46ff52.717af8",\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": 1116.0623779296875,\r
-        "y": 491.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 484.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "236d61d5.47d9a6",\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": 1120,\r
-        "y": 536,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 529,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c296586e.046f08",\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": 1150,\r
-        "y": 442,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 435,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b77b70ed.c591c"\r
+                "111942fe.354315"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b77b70ed.c591c",\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": 1373.33349609375,\r
-        "y": 441.99993896484375,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 434.99993896484375,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2fc295b4.0602da"\r
+                "ff15f851.7a7528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2fc295b4.0602da",\r
+        "id": "ff15f851.7a7528",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1574.0001335144043,\r
-        "y": 443.00002098083496,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 436.00002098083496,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "483259b4.af3e1"\r
+                "cf901b65.835fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cba9b813.e1b22",\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": 3835,\r
-        "y": 162,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4393,\r
+        "y": 152,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c84632a9.494938",\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "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": 3916,\r
-        "y": 477,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4474,\r
+        "y": 467,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f012f442.27b7b8",\r
-                "961e7c8c.e8988"\r
+                "40316706.17eb48",\r
+                "6c473f1b.946a08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f012f442.27b7b8",\r
+        "id": "40316706.17eb48",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4225.5,\r
-        "y": 446,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4783.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "85de6f60.586588"\r
+                "aea69973.33e85"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "961e7c8c.e8988",\r
+        "id": "6c473f1b.946a08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4230.5,\r
-        "y": 511,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4788.5,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b3e28f35.f331c"\r
+                "d21a082d.2cad68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85de6f60.586588",\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 vpn rest api\" />\n",\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": 4401.5,\r
-        "y": 446,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4959.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3e28f35.f331c",\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": 4397,\r
-        "y": 511,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4955,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9e9578a4.5a4df",\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": 3782.5,\r
-        "y": 665,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4340.5,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d5f5723.afac28",\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=\"post\"/>\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
+        "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": 3936.5,\r
-        "y": 713,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4494.5,\r
+        "y": 703,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7efa3090.e1e078",\r
-                "602bb58a.eb8054"\r
+                "8236b8ec.5fd17",\r
+                "51c5e2c3.871744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7efa3090.e1e078",\r
+        "id": "8236b8ec.5fd17",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4282,\r
-        "y": 694,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4840,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d892eebe.cdbb5"\r
+                "b89e8953.c6ac88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "602bb58a.eb8054",\r
+        "id": "51c5e2c3.871744",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4286,\r
-        "y": 734,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4844,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "34660646.412fea"\r
+                "933ba47e.14e65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d892eebe.cdbb5",\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 vpn rest api\" />\n",\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": 4440,\r
-        "y": 694,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4998,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "34660646.412fea",\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": 4443.5,\r
-        "y": 734,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5001.5,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "63e48280.b2cb84",\r
-                "ffe3929d.a2fda"\r
+                "363131ab.be28b6",\r
+                "fcee3485.dea4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bae980db.b9d408",\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": 3780,\r
-        "y": 621,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4338,\r
+        "y": 611,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63e48280.b2cb84",\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": 4774,\r
-        "y": 699,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5332,\r
+        "y": 689,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2bc3079a.d7dde",\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": 4638,\r
-        "y": 658,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5196,\r
+        "y": 648,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffe3929d.a2fda",\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": 4701,\r
-        "y": 745,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5259,\r
+        "y": 735,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f01334b4.1d8928",\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": 3773,\r
-        "y": 210,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4331,\r
+        "y": 200,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbf99a2b.67c71",\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": 3799,\r
-        "y": 327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4357,\r
+        "y": 317,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "27a62f4.f17ab5",\r
-                "1aa65c21.28f974",\r
-                "a732e62d.9d3f9"\r
+                "33823e1a.9269c2",\r
+                "b38b9e38.f8c8a8",\r
+                "9f21383a.68cb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27a62f4.f17ab5",\r
+        "id": "33823e1a.9269c2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3994.5001220703125,\r
-        "y": 279,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4552.5001220703125,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b04b9242.14b66"\r
+                "755b5bf3.347744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1aa65c21.28f974",\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": 3986.5001220703125,\r
-        "y": 334,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4544.5001220703125,\r
+        "y": 324,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5b188d77.8ffc8c"\r
+                "5d1291bc.3b9d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b04b9242.14b66",\r
+        "id": "755b5bf3.347744",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4138.8824462890625,\r
-        "y": 278.6556701660156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4696.8824462890625,\r
+        "y": 268.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "14763204.df94c6"\r
+                "5007d6bb.a571d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a517ec9b.cf8fc8",\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": 4721,\r
-        "y": 281,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5279,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "37ce34d7.e5314c"\r
+                "1053f3a3.2846c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14763204.df94c6",\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": 4323,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4881,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bbbe4e04.e26da"\r
+                "33b94d0d.c61ee2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bbbe4e04.e26da",\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": 4518,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5076,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a517ec9b.cf8fc8"\r
+                "c0da9575.eb2c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a732e62d.9d3f9",\r
+        "id": "9f21383a.68cb9",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3991.5001220703125,\r
-        "y": 391,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4549.5001220703125,\r
+        "y": 381,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ebcd1e8f.a8cb18"\r
+                "e621d08a.7d07a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebcd1e8f.a8cb18",\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": 4143.5001220703125,\r
-        "y": 392,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4701.5001220703125,\r
+        "y": 382,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5b188d77.8ffc8c",\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": 4154.5001220703125,\r
-        "y": 335,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4712.5001220703125,\r
+        "y": 325,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d99536cb.cbc39",\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": 5106,\r
-        "y": 294,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5664,\r
+        "y": 284,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5f8e12fe.363034",\r
-                "3e541a04.379ece",\r
-                "5e7e63a7.7acdcc"\r
+                "41428f.b99c7d7",\r
+                "92b16ebc.198be8",\r
+                "47593c0a.609b2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37ce34d7.e5314c",\r
+        "id": "1053f3a3.2846c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4900,\r
-        "y": 281,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5458,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "17ccdbf.84352a4",\r
-                "d99536cb.cbc39"\r
+                "db2fdd1f.f44e1",\r
+                "bace4f35.dcb4f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17ccdbf.84352a4",\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": 5136,\r
-        "y": 242,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5694,\r
+        "y": 232,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5f8e12fe.363034",\r
+        "id": "41428f.b99c7d7",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5316,\r
-        "y": 285,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5874,\r
+        "y": 275,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a674bdd4.cbe5f"\r
+                "d8c57966.bba2b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e541a04.379ece",\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": 5308,\r
-        "y": 340,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5866,\r
+        "y": 330,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b14ed6a2.e3874"\r
+                "bbecf65b.0991f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e7e63a7.7acdcc",\r
+        "id": "47593c0a.609b2c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5313,\r
-        "y": 397,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5871,\r
+        "y": 387,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1ce96021.1d8b"\r
+                "17aa566c.ce27ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ce96021.1d8b",\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": 5465,\r
-        "y": 398,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6023,\r
+        "y": 388,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b14ed6a2.e3874",\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": 5476,\r
-        "y": 343,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6034,\r
+        "y": 333,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a674bdd4.cbe5f",\r
+        "id": "d8c57966.bba2b8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5460.38232421875,\r
-        "y": 282.6556701660156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6018.38232421875,\r
+        "y": 272.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "67e87cc0.72543c"\r
+                "eeaaed9f.46288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67e87cc0.72543c",\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": 5675,\r
-        "y": 279,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6233,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9bca10ea.41532",\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": 700,\r
-        "y": 456,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 449,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9469a92e.1082c",\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-src-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": 3815,\r
-        "y": 966,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3800,\r
+        "y": 1609,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e72aaca.f223b8",\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "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": 3878,\r
-        "y": 1295,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3863,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4967c60e.7eec88",\r
-                "d728c3b6.b72d4"\r
+                "dcc57379.86dfe8",\r
+                "c898077c.fa069"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4967c60e.7eec88",\r
+        "id": "dcc57379.86dfe8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4173.5,\r
-        "y": 1262,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4158.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "957f3c62.36bab"\r
+                "abcd166d.ac4418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d728c3b6.b72d4",\r
+        "id": "c898077c.fa069",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4178.5,\r
-        "y": 1327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4163.5,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9b37bb11.43c248"\r
+                "a337c775.425078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "957f3c62.36bab",\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 vpn rest api\" />\n",\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": 4341.5,\r
-        "y": 1262,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4326.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b37bb11.43c248",\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": 4352,\r
-        "y": 1327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4337,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24fc86b.f179cfa",\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": 3754,\r
-        "y": 1023,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3739,\r
+        "y": 1666,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4e80e5.b17c0f",\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": 3774,\r
-        "y": 1120,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3759,\r
+        "y": 1763,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d87e44a4.312df",\r
-                "c39adf70.78fbd",\r
-                "ae2b50d9.d9592"\r
+                "a75ca9d.3439f58",\r
+                "399b40eb.8cb2c",\r
+                "c23ae6cb.c49a18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d87e44a4.312df",\r
+        "id": "a75ca9d.3439f58",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3976.5001220703125,\r
-        "y": 1073,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3961.5001220703125,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1f01bb4d.6d662d"\r
+                "7c251cdc.702f24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c39adf70.78fbd",\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": 3968.5001220703125,\r
-        "y": 1128,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3953.5001220703125,\r
+        "y": 1771,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7e32fa48.cb95e4"\r
+                "9ad884c8.666098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f01bb4d.6d662d",\r
+        "id": "7c251cdc.702f24",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4120.8824462890625,\r
-        "y": 1070.6556701660156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4105.8824462890625,\r
+        "y": 1713.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "71c66ab3.44665c"\r
+                "cb9eeb5b.e8a49"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "71c66ab3.44665c",\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": 4305,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4290,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7900c812.a2abd"\r
+                "3d062c6c.6ff5d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae2b50d9.d9592",\r
+        "id": "c23ae6cb.c49a18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3973.5001220703125,\r
-        "y": 1185,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3958.5001220703125,\r
+        "y": 1828,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c7f28bc4.db74a"\r
+                "c325aab2.4755e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7f28bc4.db74a",\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": 4125.5001220703125,\r
-        "y": 1186,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4110.5001220703125,\r
+        "y": 1829,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e32fa48.cb95e4",\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": 4136.5001220703125,\r
-        "y": 1131,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4121.5001220703125,\r
+        "y": 1774,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d3528946.ee7a88",\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": 4703,\r
-        "y": 1089,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4688,\r
+        "y": 1732,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "746ece73.5c4d48"\r
+                "edc0cd69.586d38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7900c812.a2abd",\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": 4500,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4485,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d3528946.ee7a88"\r
+                "34bca75e.e09988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8459d33.082c4",\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": 5088,\r
-        "y": 1088,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5073,\r
+        "y": 1731,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "652db70b.f69af",\r
-                "cd87b694.170a2",\r
-                "e10452ec.f851f"\r
+                "efe05c93.e4bd48",\r
+                "c004c915.8de7",\r
+                "8875f4b.bcb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "746ece73.5c4d48",\r
+        "id": "edc0cd69.586d38",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4880,\r
-        "y": 1081,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4865,\r
+        "y": 1724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "13e8c9be.60d2ee",\r
-                "f8459d33.082c4"\r
+                "bd388c7d.2a51e",\r
+                "f5373d88.e0f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13e8c9be.60d2ee",\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": 5118,\r
-        "y": 1036,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5103,\r
+        "y": 1679,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "64b1d1df.af4928",\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": 5447,\r
-        "y": 1192,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5432,\r
+        "y": 1835,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "afae5d5f.cf8cd8",\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": 5458,\r
-        "y": 1137,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5443,\r
+        "y": 1780,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe8767e6.75d1",\r
+        "id": "97f3ba34.f2dc7",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5442.38232421875,\r
-        "y": 1076.6556701660156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5427.38232421875,\r
+        "y": 1719.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9e679808.748fd"\r
+                "5b487de9.7c9484"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e679808.748fd",\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": 5657,\r
-        "y": 1073,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5642,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "652db70b.f69af",\r
+        "id": "efe05c93.e4bd48",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5298,\r
-        "y": 1079,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5283,\r
+        "y": 1722,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "fe8767e6.75d1"\r
+                "97f3ba34.f2dc7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd87b694.170a2",\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": 5290,\r
-        "y": 1134,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5275,\r
+        "y": 1777,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "afae5d5f.cf8cd8"\r
+                "56448bab.caa82c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e10452ec.f851f",\r
+        "id": "8875f4b.bcb6f88",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5295,\r
-        "y": 1191,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5280,\r
+        "y": 1834,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "64b1d1df.af4928"\r
+                "c54d67f1.3a38c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "483259b4.af3e1",\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": 1812,\r
-        "y": 445,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 438,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "deb24009.8fcaa8",\r
-                "f99db731.cec29",\r
-                "20c66e63.50491a"\r
+                "a3e158df.aec638",\r
+                "28bc0271.0f9e9e",\r
+                "12a8a0b5.4084c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "deb24009.8fcaa8",\r
+        "id": "a3e158df.aec638",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2020,\r
-        "y": 409,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 402,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4730a3bd.f32424"\r
+                "8651df9.9efa52"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99db731.cec29",\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": 2020.490966796875,\r
-        "y": 454.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 447.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5f621d7d.168d04"\r
+                "b3859ee9.a63778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20c66e63.50491a",\r
+        "id": "12a8a0b5.4084c7",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2018,\r
-        "y": 498,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3d808fc9.409a"\r
+                "b1a3023.979458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f621d7d.168d04",\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": 2183.0623779296875,\r
-        "y": 454.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 447.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3d808fc9.409a",\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": 2187,\r
-        "y": 499,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 492,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bf7163.623b18",\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": 2493,\r
-        "y": 498,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4a10f363.97f04c",\r
-                "75240e64.8364b",\r
-                "7a8b2677.1e3f6"\r
+                "19de242e.79b56c",\r
+                "e1533c2.9fadc4",\r
+                "da41548.4c59da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "262c25a6.ad70a2",\r
+        "id": "108df7f5.f0405",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2877,\r
-        "y": 498,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2873,\r
+        "y": 579,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "471d55bd.ad492c"\r
+                "19520422.b45d4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a10f363.97f04c",\r
+        "id": "19de242e.79b56c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2704,\r
-        "y": 500,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 580,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "262c25a6.ad70a2"\r
+                "108df7f5.f0405"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75240e64.8364b",\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": 2704.490966796875,\r
-        "y": 545.5740356445312,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2706.490966796875,\r
+        "y": 475.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1484cf74.c39e71"\r
+                "efbdd7a3.5958d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a8b2677.1e3f6",\r
+        "id": "da41548.4c59da8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2702,\r
-        "y": 589,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d377f001.ff927"\r
+                "e03f3a11.4be118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d377f001.ff927",\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": 2869,\r
-        "y": 588,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2870,\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1484cf74.c39e71",\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": 2867.0623779296875,\r
-        "y": 545.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2869.0625,\r
+        "y": 474.8597412109375,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4730a3bd.f32424",\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": 2221,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ed79cbad.42008"\r
+                "6856373e.df8d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed79cbad.42008",\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": 2426,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "87636f23.10a238"\r
+                "61b4f44b.e9282c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87636f23.10a238",\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": 2592,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f49319bb.999b88"\r
+                "9aa1bdef.a85148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f49319bb.999b88",\r
+        "id": "9aa1bdef.a85148",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2755,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "98bf7163.623b18"\r
+                "e921a3d6.75f8b8",\r
+                "8b7a547c.5a78f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "471d55bd.ad492c",\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": 3131,\r
-        "y": 497,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3314,\r
+        "y": 680,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a6851b6e.131e78",\r
-                "f997812a.bb5bf"\r
+                "ce7e100e.65e8d8",\r
+                "978d0324.53a218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6851b6e.131e78",\r
+        "id": "ce7e100e.65e8d8",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3384,\r
-        "y": 531,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3528,\r
+        "y": 717,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9ec23d9e.f5fd3"\r
+                "d3a9cf8b.6d8898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f997812a.bb5bf",\r
+        "id": "978d0324.53a218",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3384,\r
-        "y": 475,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3530,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a48cbe42.98bbb"\r
+                "eacef09.695731"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ec23d9e.f5fd3",\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": 3123,\r
-        "y": 1317,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3108,\r
+        "y": 1960,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "12733247.02817e",\r
-                "457dfc0a.58968c"\r
+                "a298a9c0.8f44e8",\r
+                "ca55eca6.1cb808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12733247.02817e",\r
+        "id": "a298a9c0.8f44e8",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3376,\r
-        "y": 1351,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3361,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "13d35870.d79cf8"\r
+                "c785caf0.121d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "457dfc0a.58968c",\r
+        "id": "ca55eca6.1cb808",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3376,\r
-        "y": 1295,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3361,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b272db0a.663f1"\r
+                "6d0b6c95.2359f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13d35870.d79cf8",\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": 3527,\r
-        "y": 1351,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3512,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d316857d.f41628",\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": 3830,\r
-        "y": 102,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4388,\r
+        "y": 92,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3accaf74.7f8a68",\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": 3811,\r
-        "y": 908,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3796,\r
+        "y": 1551,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a48cbe42.98bbb",\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": 3552,\r
-        "y": 477,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4079,\r
+        "y": 349,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d316857d.f41628",\r
-                "cba9b813.e1b22",\r
-                "f01334b4.1d8928",\r
-                "dbf99a2b.67c71",\r
-                "9e9578a4.5a4df",\r
-                "8d5f5723.afac28",\r
-                "c84632a9.494938"\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": "b272db0a.663f1",\r
+        "id": "6d0b6c95.2359f4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3527,\r
-        "y": 1294,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3512,\r
+        "y": 1937,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3accaf74.7f8a68",\r
-                "9469a92e.1082c",\r
-                "24fc86b.f179cfa",\r
-                "a4e80e5.b17c0f",\r
-                "8e72aaca.f223b8",\r
-                "6e17b735.11933",\r
-                "35d8443b.290754"\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": "6e17b735.11933",\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": 3756,\r
-        "y": 1437,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3741,\r
+        "y": 2080,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "35d8443b.290754",\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": 3910,\r
-        "y": 1485,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3895,\r
+        "y": 2128,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3ee71f70.cef2d8",\r
-                "ec28887e.13052"\r
+                "ec9bb97a.fa7b4",\r
+                "d7a86063.21272"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee71f70.cef2d8",\r
+        "id": "ec9bb97a.fa7b4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4255.5,\r
-        "y": 1466,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4240.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "146e8cbe.f1427b"\r
+                "23e4ab97.fe6f5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec28887e.13052",\r
+        "id": "d7a86063.21272",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4259.5,\r
-        "y": 1506,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4244.5,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "6938dd8d.725ce4"\r
+                "3d3a171d.cfa4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "146e8cbe.f1427b",\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 vpn rest api\" />\n",\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": 4413.5,\r
-        "y": 1466,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4398.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6938dd8d.725ce4",\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": 4417,\r
-        "y": 1506,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4402,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "3103adf.03ebdd2",\r
-                "abd5a958.8851"\r
+                "5d084d8a.b2f23c",\r
+                "44dbf2a2.960644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5e2d859.f89e48",\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": 3753.5,\r
-        "y": 1393,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3738.5,\r
+        "y": 2036,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3103adf.03ebdd2",\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": 4757,\r
-        "y": 1505,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4742,\r
+        "y": 2148,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1ee5068c.50a041",\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": 4615,\r
-        "y": 1463,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4600,\r
+        "y": 2106,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "abd5a958.8851",\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": 4686,\r
-        "y": 1554,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4671,\r
+        "y": 2197,\r
+        "z": "4996e636.3ea08",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "dcf1d309.aad128",\r
+        "type": "set",\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": 3305,\r
+        "y": 620,\r
+        "z": "4996e636.3ea08",\r
+        "wires": []\r
+    },\r
+    {\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": 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