Passing a correct OTN tunnel ID and a correct Ethernet Service ID for deletion.

[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..44b359b 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": "d9508d21.fa5b3",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 130,\r
-        "y": 87,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 144,\r
+        "y": 116,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "d58b4202.9cdb3"\r
+                "cae32381.bce9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d58b4202.9cdb3",\r
+        "id": "cae32381.bce9d",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,1717 +22,1741 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 261.2856903076172,\r
-        "y": 136.23810863494873,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 275.2856903076172,\r
+        "y": 165.23810863494873,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "617bde2e.1132b"\r
+                "82cfa8a0.a91dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "617bde2e.1132b",\r
+        "id": "82cfa8a0.a91dc",\r
          "type": "method",\r
          "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
          "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 264.4286193847656,\r
-        "y": 221.00003242492676,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 278.4286193847656,\r
+        "y": 250.00003242492676,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "8ac7a60e.72d768"\r
+                "f6fef19d.8fc9f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ac7a60e.72d768",\r
+        "id": "f6fef19d.8fc9f8",\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
+        "x": 428.238037109375,\r
+        "y": 379.6666564941406,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "72b21bde.5e8f94",\r
-                "9fe7f5eb.e26c6",\r
-                "9bca10ea.41532"\r
+                "c70167ce.7f9118",\r
+                "6aca196e.a4377",\r
+                "e86e6571.913898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "72b21bde.5e8f94",\r
+        "id": "c70167ce.7f9118",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
-        "x": 682.5716552734375,\r
-        "y": 737.59716796875,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 696.5716552734375,\r
+        "y": 766.59716796875,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "441fc399.08ca9c",\r
+        "id": "d841551.d686928",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 714,\r
-        "y": 412,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 728,\r
+        "y": 441,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fe7f5eb.e26c6",\r
+        "id": "6aca196e.a4377",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 734,\r
-        "y": 508,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 748,\r
+        "y": 537,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "926c12ae.af2a48",\r
-                "5deb4cbf.60b5f4",\r
-                "35c77549.8e65c2"\r
+                "8dfdefd.d3d4d9",\r
+                "f6a9e3a5.f26778",\r
+                "6cad2633.e5f528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "926c12ae.af2a48",\r
+        "id": "8dfdefd.d3d4d9",\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
+        "x": 967,\r
+        "y": 475,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "c296586e.046f08"\r
+                "f2dd8538.5d3378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5deb4cbf.60b5f4",\r
+        "id": "f6a9e3a5.f26778",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 962.490966796875,\r
-        "y": 488.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 976.490966796875,\r
+        "y": 517.5740356445312,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "bb46ff52.717af8"\r
+                "59b21b6f.e70b7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35c77549.8e65c2",\r
+        "id": "6cad2633.e5f528",\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
+        "x": 965,\r
+        "y": 564,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "236d61d5.47d9a6"\r
+                "95c7d05e.93c3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb46ff52.717af8",\r
+        "id": "59b21b6f.e70b7c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1116.0623779296875,\r
-        "y": 491.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1130.0623779296875,\r
+        "y": 520.8597717285156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "236d61d5.47d9a6",\r
+        "id": "95c7d05e.93c3e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1120,\r
-        "y": 536,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1134,\r
+        "y": 565,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c296586e.046f08",\r
+        "id": "f2dd8538.5d3378",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1150,\r
-        "y": 442,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1164,\r
+        "y": 471,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "b77b70ed.c591c"\r
+                "94e5618.e7d282"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b77b70ed.c591c",\r
+        "id": "94e5618.e7d282",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1373.33349609375,\r
-        "y": 441.99993896484375,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1387.33349609375,\r
+        "y": 470.99993896484375,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "2fc295b4.0602da"\r
+                "32140056.199ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2fc295b4.0602da",\r
+        "id": "32140056.199ae",\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
+        "x": 1588.0001335144043,\r
+        "y": 472.00002098083496,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "483259b4.af3e1"\r
+                "9174febc.b8b998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cba9b813.e1b22",\r
+        "id": "25e7d332.a761fc",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3835,\r
-        "y": 162,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3849,\r
+        "y": 191,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c84632a9.494938",\r
+        "id": "fee47d9.4382e",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 3930,\r
+        "y": 506,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "f012f442.27b7b8",\r
-                "961e7c8c.e8988"\r
+                "445402d7.16a9f4",\r
+                "d34714f7.10a51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f012f442.27b7b8",\r
+        "id": "445402d7.16a9f4",\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": 4239.5,\r
+        "y": 475,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "85de6f60.586588"\r
+                "69fb5a0d.27a12c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "961e7c8c.e8988",\r
+        "id": "d34714f7.10a51",\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": 4244.5,\r
+        "y": 540,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "b3e28f35.f331c"\r
+                "f0eccde.2c0533"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85de6f60.586588",\r
+        "id": "69fb5a0d.27a12c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4415.5,\r
+        "y": 475,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3e28f35.f331c",\r
+        "id": "f0eccde.2c0533",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4397,\r
-        "y": 511,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4411,\r
+        "y": 540,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9e9578a4.5a4df",\r
+        "id": "a96cdedb.06ef48",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 3782.5,\r
-        "y": 665,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3796.5,\r
+        "y": 694,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d5f5723.afac28",\r
+        "id": "616c98c7.f82ea8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 3950.5,\r
+        "y": 742,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "7efa3090.e1e078",\r
-                "602bb58a.eb8054"\r
+                "eef8ae3.fdd1a5",\r
+                "8f2e62b6.e98788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7efa3090.e1e078",\r
+        "id": "eef8ae3.fdd1a5",\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": 4296,\r
+        "y": 723,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "d892eebe.cdbb5"\r
+                "f08a069b.6042c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "602bb58a.eb8054",\r
+        "id": "8f2e62b6.e98788",\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": 4300,\r
+        "y": 763,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "34660646.412fea"\r
+                "b227b2c.229c1d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d892eebe.cdbb5",\r
+        "id": "f08a069b.6042c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4454,\r
+        "y": 723,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "34660646.412fea",\r
+        "id": "b227b2c.229c1d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4443.5,\r
-        "y": 734,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4457.5,\r
+        "y": 763,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "63e48280.b2cb84",\r
-                "ffe3929d.a2fda"\r
+                "2af71c81.1e5aec",\r
+                "5fe9896d.3d8e98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bae980db.b9d408",\r
+        "id": "c5970f4b.9679a8",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3780,\r
-        "y": 621,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3794,\r
+        "y": 650,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63e48280.b2cb84",\r
+        "id": "2af71c81.1e5aec",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "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": 4788,\r
+        "y": 728,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2bc3079a.d7dde",\r
+        "id": "48dd1ec4.51cb4",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4638,\r
-        "y": 658,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4652,\r
+        "y": 687,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffe3929d.a2fda",\r
+        "id": "5fe9896d.3d8e98",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4701,\r
-        "y": 745,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4715,\r
+        "y": 774,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f01334b4.1d8928",\r
+        "id": "75d6c996.11aeb",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3773,\r
-        "y": 210,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3787,\r
+        "y": 239,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbf99a2b.67c71",\r
+        "id": "c824ab5b.360f6",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3799,\r
-        "y": 327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3813,\r
+        "y": 356,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "27a62f4.f17ab5",\r
-                "1aa65c21.28f974",\r
-                "a732e62d.9d3f9"\r
+                "19cd8085.d8fca7",\r
+                "ff1311fc.28b29",\r
+                "929f1027.4a5828"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27a62f4.f17ab5",\r
+        "id": "19cd8085.d8fca7",\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": 4008.5001220703125,\r
+        "y": 308,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "b04b9242.14b66"\r
+                "a2185ea8.7f403"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1aa65c21.28f974",\r
+        "id": "ff1311fc.28b29",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3986.5001220703125,\r
-        "y": 334,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4000.5001220703125,\r
+        "y": 363,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "5b188d77.8ffc8c"\r
+                "c3cea897.f88808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b04b9242.14b66",\r
+        "id": "a2185ea8.7f403",\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": 4152.8824462890625,\r
+        "y": 307.6556701660156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "14763204.df94c6"\r
+                "eb7f6fc2.5f3468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a517ec9b.cf8fc8",\r
+        "id": "a0fa7da8.75192",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4721,\r
-        "y": 281,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4735,\r
+        "y": 310,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "37ce34d7.e5314c"\r
+                "809287e6.83f07"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14763204.df94c6",\r
+        "id": "eb7f6fc2.5f3468",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4323,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4337,\r
+        "y": 306,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "bbbe4e04.e26da"\r
+                "21971ee2.f88962"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bbbe4e04.e26da",\r
+        "id": "21971ee2.f88962",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4518,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4532,\r
+        "y": 306,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "a517ec9b.cf8fc8"\r
+                "a0fa7da8.75192"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a732e62d.9d3f9",\r
+        "id": "929f1027.4a5828",\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": 4005.5001220703125,\r
+        "y": 420,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "ebcd1e8f.a8cb18"\r
+                "5ece63ab.72534c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebcd1e8f.a8cb18",\r
+        "id": "5ece63ab.72534c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4143.5001220703125,\r
-        "y": 392,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4157.5001220703125,\r
+        "y": 421,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5b188d77.8ffc8c",\r
+        "id": "c3cea897.f88808",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4154.5001220703125,\r
-        "y": 335,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4168.5001220703125,\r
+        "y": 364,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d99536cb.cbc39",\r
+        "id": "fd9485b.71b4af8",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5106,\r
-        "y": 294,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5120,\r
+        "y": 323,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "5f8e12fe.363034",\r
-                "3e541a04.379ece",\r
-                "5e7e63a7.7acdcc"\r
+                "12fe3fd6.ccef78",\r
+                "5cf62e0d.6aa85",\r
+                "156d902b.c3731"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37ce34d7.e5314c",\r
+        "id": "809287e6.83f07",\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": 4914,\r
+        "y": 310,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "17ccdbf.84352a4",\r
-                "d99536cb.cbc39"\r
+                "a1955015.d4546",\r
+                "fd9485b.71b4af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17ccdbf.84352a4",\r
+        "id": "a1955015.d4546",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5136,\r
-        "y": 242,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5150,\r
+        "y": 271,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5f8e12fe.363034",\r
+        "id": "12fe3fd6.ccef78",\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": 5330,\r
+        "y": 314,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "a674bdd4.cbe5f"\r
+                "cc3a75a4.21fc7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e541a04.379ece",\r
+        "id": "5cf62e0d.6aa85",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5308,\r
-        "y": 340,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5322,\r
+        "y": 369,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "b14ed6a2.e3874"\r
+                "bff3bfa.5f55cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e7e63a7.7acdcc",\r
+        "id": "156d902b.c3731",\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": 5327,\r
+        "y": 426,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "1ce96021.1d8b"\r
+                "be590afe.7cc5a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ce96021.1d8b",\r
+        "id": "be590afe.7cc5a8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5465,\r
-        "y": 398,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5479,\r
+        "y": 427,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b14ed6a2.e3874",\r
+        "id": "bff3bfa.5f55cc",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5476,\r
-        "y": 343,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5490,\r
+        "y": 372,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a674bdd4.cbe5f",\r
+        "id": "cc3a75a4.21fc7",\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": 5474.38232421875,\r
+        "y": 311.6556701660156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "67e87cc0.72543c"\r
+                "665ad654.79ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67e87cc0.72543c",\r
+        "id": "665ad654.79ee8",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5675,\r
-        "y": 279,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5689,\r
+        "y": 308,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9bca10ea.41532",\r
+        "id": "e86e6571.913898",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 700,\r
-        "y": 456,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 714,\r
+        "y": 485,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9469a92e.1082c",\r
+        "id": "27bc86e9.1c4e52",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-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-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": 3829,\r
+        "y": 995,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e72aaca.f223b8",\r
+        "id": "f8350413.ea8398",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 3892,\r
+        "y": 1324,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "4967c60e.7eec88",\r
-                "d728c3b6.b72d4"\r
+                "4e841df5.4d2d34",\r
+                "5e6f0ddb.0967b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4967c60e.7eec88",\r
+        "id": "4e841df5.4d2d34",\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": 4187.5,\r
+        "y": 1291,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "957f3c62.36bab"\r
+                "8fb2eae.74bbb98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d728c3b6.b72d4",\r
+        "id": "5e6f0ddb.0967b4",\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": 4192.5,\r
+        "y": 1356,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "9b37bb11.43c248"\r
+                "9fef13b3.660c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "957f3c62.36bab",\r
+        "id": "8fb2eae.74bbb98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4355.5,\r
+        "y": 1291,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b37bb11.43c248",\r
+        "id": "9fef13b3.660c58",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4352,\r
-        "y": 1327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4366,\r
+        "y": 1356,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24fc86b.f179cfa",\r
+        "id": "2fd670.86d5219",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3754,\r
-        "y": 1023,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3768,\r
+        "y": 1052,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4e80e5.b17c0f",\r
+        "id": "8581969f.3e9f8",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3774,\r
-        "y": 1120,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3788,\r
+        "y": 1149,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "d87e44a4.312df",\r
-                "c39adf70.78fbd",\r
-                "ae2b50d9.d9592"\r
+                "3c9a5980.f5df5e",\r
+                "6737c173.340e3",\r
+                "68a240da.0733"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d87e44a4.312df",\r
+        "id": "3c9a5980.f5df5e",\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": 3990.5001220703125,\r
+        "y": 1102,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "1f01bb4d.6d662d"\r
+                "ea38c477.b7b2f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c39adf70.78fbd",\r
+        "id": "6737c173.340e3",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3968.5001220703125,\r
-        "y": 1128,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3982.5001220703125,\r
+        "y": 1157,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "7e32fa48.cb95e4"\r
+                "8bbc992f.718ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f01bb4d.6d662d",\r
+        "id": "ea38c477.b7b2f",\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": 4134.8824462890625,\r
+        "y": 1099.6556701660156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "71c66ab3.44665c"\r
+                "18cecfe3.6de9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "71c66ab3.44665c",\r
+        "id": "18cecfe3.6de9e",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4305,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4319,\r
+        "y": 1114,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "7900c812.a2abd"\r
+                "68f9f038.67b62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae2b50d9.d9592",\r
+        "id": "68a240da.0733",\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": 3987.5001220703125,\r
+        "y": 1214,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "c7f28bc4.db74a"\r
+                "20686ade.8b231e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7f28bc4.db74a",\r
+        "id": "20686ade.8b231e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4125.5001220703125,\r
-        "y": 1186,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4139.5001220703125,\r
+        "y": 1215,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e32fa48.cb95e4",\r
+        "id": "8bbc992f.718ea",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4136.5001220703125,\r
-        "y": 1131,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4150.5001220703125,\r
+        "y": 1160,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d3528946.ee7a88",\r
+        "id": "597aa62c.50d3c",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4703,\r
-        "y": 1089,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4717,\r
+        "y": 1118,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "746ece73.5c4d48"\r
+                "e04d6fa3.eba9f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7900c812.a2abd",\r
+        "id": "68f9f038.67b62",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4500,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4514,\r
+        "y": 1114,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "d3528946.ee7a88"\r
+                "597aa62c.50d3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8459d33.082c4",\r
+        "id": "2f50548b.6d0f1c",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5088,\r
-        "y": 1088,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5102,\r
+        "y": 1117,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "652db70b.f69af",\r
-                "cd87b694.170a2",\r
-                "e10452ec.f851f"\r
+                "a769e440.df581",\r
+                "a7207c49.d2bbc",\r
+                "1e0583ed.3bab5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "746ece73.5c4d48",\r
+        "id": "e04d6fa3.eba9f",\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": 4894,\r
+        "y": 1110,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "13e8c9be.60d2ee",\r
-                "f8459d33.082c4"\r
+                "eacacb80.08d4c",\r
+                "2f50548b.6d0f1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13e8c9be.60d2ee",\r
+        "id": "eacacb80.08d4c",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5118,\r
-        "y": 1036,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5132,\r
+        "y": 1065,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "64b1d1df.af4928",\r
+        "id": "61827e75.b97ad8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5447,\r
-        "y": 1192,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5461,\r
+        "y": 1221,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "afae5d5f.cf8cd8",\r
+        "id": "b6c7c29b.5ee08",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5458,\r
-        "y": 1137,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5472,\r
+        "y": 1166,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe8767e6.75d1",\r
+        "id": "7c1b7b20.2d7bbc",\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": 5456.38232421875,\r
+        "y": 1105.6556701660156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "9e679808.748fd"\r
+                "9190ad56.af3378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e679808.748fd",\r
+        "id": "9190ad56.af3378",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5657,\r
-        "y": 1073,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5671,\r
+        "y": 1102,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "652db70b.f69af",\r
+        "id": "a769e440.df581",\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": 5312,\r
+        "y": 1108,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "fe8767e6.75d1"\r
+                "7c1b7b20.2d7bbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd87b694.170a2",\r
+        "id": "a7207c49.d2bbc",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5290,\r
-        "y": 1134,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5304,\r
+        "y": 1163,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "afae5d5f.cf8cd8"\r
+                "b6c7c29b.5ee08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e10452ec.f851f",\r
+        "id": "1e0583ed.3bab5c",\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": 5309,\r
+        "y": 1220,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "64b1d1df.af4928"\r
+                "61827e75.b97ad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "483259b4.af3e1",\r
+        "id": "9174febc.b8b998",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1812,\r
-        "y": 445,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1826,\r
+        "y": 474,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "deb24009.8fcaa8",\r
-                "f99db731.cec29",\r
-                "20c66e63.50491a"\r
+                "c96ce0ff.9fbaf8",\r
+                "96dddcba.eaaec8",\r
+                "4ccaabcc.f5bb34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "deb24009.8fcaa8",\r
+        "id": "c96ce0ff.9fbaf8",\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
+        "x": 2034,\r
+        "y": 438,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "4730a3bd.f32424"\r
+                "5281d926.1c9dd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99db731.cec29",\r
+        "id": "96dddcba.eaaec8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2020.490966796875,\r
-        "y": 454.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2034.490966796875,\r
+        "y": 483.57403564453125,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "5f621d7d.168d04"\r
+                "50a19d40.768324"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20c66e63.50491a",\r
+        "id": "4ccaabcc.f5bb34",\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
+        "x": 2032,\r
+        "y": 527,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "3d808fc9.409a"\r
+                "ffedf4ef.62de2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f621d7d.168d04",\r
+        "id": "50a19d40.768324",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2183.0623779296875,\r
-        "y": 454.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2197.0623779296875,\r
+        "y": 483.8597717285156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3d808fc9.409a",\r
+        "id": "ffedf4ef.62de2",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2187,\r
-        "y": 499,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2201,\r
+        "y": 528,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bf7163.623b18",\r
+        "id": "113dd07d.86f868",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2493,\r
-        "y": 498,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2507,\r
+        "y": 527,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "4a10f363.97f04c",\r
-                "75240e64.8364b",\r
-                "7a8b2677.1e3f6"\r
+                "2b6a4b71.479d3c",\r
+                "34c32e6f.a9d052",\r
+                "c2c66c33.7e24d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "262c25a6.ad70a2",\r
+        "id": "7a40580d.1d5388",\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": 2891,\r
+        "y": 527,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "471d55bd.ad492c"\r
+                "eeee2acf.9c0ba8",\r
+                "57847c7b.2f3dbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a10f363.97f04c",\r
+        "id": "2b6a4b71.479d3c",\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
+        "x": 2718,\r
+        "y": 529,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "262c25a6.ad70a2"\r
+                "7a40580d.1d5388"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75240e64.8364b",\r
+        "id": "34c32e6f.a9d052",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2704.490966796875,\r
-        "y": 545.5740356445312,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2718.490966796875,\r
+        "y": 574.5740356445312,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "1484cf74.c39e71"\r
+                "17c937f3.281d28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a8b2677.1e3f6",\r
+        "id": "c2c66c33.7e24d",\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
+        "x": 2716,\r
+        "y": 618,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "d377f001.ff927"\r
+                "45484d04.351e94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d377f001.ff927",\r
+        "id": "45484d04.351e94",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2869,\r
-        "y": 588,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2883,\r
+        "y": 617,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1484cf74.c39e71",\r
+        "id": "17c937f3.281d28",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2867.0623779296875,\r
-        "y": 545.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2881.0623779296875,\r
+        "y": 574.8597717285156,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4730a3bd.f32424",\r
+        "id": "5281d926.1c9dd",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2221,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2235,\r
+        "y": 433,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "ed79cbad.42008"\r
+                "24c8cf8c.d35f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed79cbad.42008",\r
+        "id": "24c8cf8c.d35f5",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2426,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2440,\r
+        "y": 433,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "87636f23.10a238"\r
+                "ffd8562e.6c7ab"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87636f23.10a238",\r
+        "id": "ffd8562e.6c7ab",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2592,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2606,\r
+        "y": 433,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "f49319bb.999b88"\r
+                "1639e360.7db745"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f49319bb.999b88",\r
+        "id": "1639e360.7db745",\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
+        "x": 2769,\r
+        "y": 433,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "98bf7163.623b18"\r
+                "113dd07d.86f868",\r
+                "b864657f.9c5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "471d55bd.ad492c",\r
+        "id": "eeee2acf.9c0ba8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3131,\r
-        "y": 497,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3145,\r
+        "y": 526,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "a6851b6e.131e78",\r
-                "f997812a.bb5bf"\r
+                "888039c0.be2748",\r
+                "40c5843d.11f78c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6851b6e.131e78",\r
+        "id": "888039c0.be2748",\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": 3398,\r
+        "y": 560,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "9ec23d9e.f5fd3"\r
+                "d751d093.92a62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f997812a.bb5bf",\r
+        "id": "40c5843d.11f78c",\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": 3398,\r
+        "y": 504,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "a48cbe42.98bbb"\r
+                "ddefc1a3.6644c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ec23d9e.f5fd3",\r
+        "id": "d751d093.92a62",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3123,\r
-        "y": 1317,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3137,\r
+        "y": 1346,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "12733247.02817e",\r
-                "457dfc0a.58968c"\r
+                "b9609f04.c7afe8",\r
+                "28e97c84.2c5ab4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12733247.02817e",\r
+        "id": "b9609f04.c7afe8",\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": 3390,\r
+        "y": 1380,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "13d35870.d79cf8"\r
+                "ee3de09a.383318"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "457dfc0a.58968c",\r
+        "id": "28e97c84.2c5ab4",\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": 3390,\r
+        "y": 1324,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "b272db0a.663f1"\r
+                "b80c5827.1a79a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13d35870.d79cf8",\r
+        "id": "ee3de09a.383318",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3527,\r
-        "y": 1351,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3541,\r
+        "y": 1380,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d316857d.f41628",\r
+        "id": "8527e1fa.cc6b4",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 3830,\r
-        "y": 102,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3844,\r
+        "y": 131,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3accaf74.7f8a68",\r
+        "id": "615fdc8e.20c4e4",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3811,\r
-        "y": 908,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3825,\r
+        "y": 937,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a48cbe42.98bbb",\r
+        "id": "ddefc1a3.6644c8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3552,\r
-        "y": 477,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3566,\r
+        "y": 506,\r
+        "z": "8a9c455f.82beb8",\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
+                "8527e1fa.cc6b4",\r
+                "25e7d332.a761fc",\r
+                "75d6c996.11aeb",\r
+                "c824ab5b.360f6",\r
+                "a96cdedb.06ef48",\r
+                "616c98c7.f82ea8",\r
+                "fee47d9.4382e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b272db0a.663f1",\r
+        "id": "b80c5827.1a79a",\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": 3541,\r
+        "y": 1323,\r
+        "z": "8a9c455f.82beb8",\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
+                "615fdc8e.20c4e4",\r
+                "27bc86e9.1c4e52",\r
+                "2fd670.86d5219",\r
+                "8581969f.3e9f8",\r
+                "f8350413.ea8398",\r
+                "96b5aedc.4196d",\r
+                "e2e659bb.42dea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6e17b735.11933",\r
+        "id": "96b5aedc.4196d",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3756,\r
-        "y": 1437,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3770,\r
+        "y": 1466,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "35d8443b.290754",\r
+        "id": "e2e659bb.42dea",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3910,\r
-        "y": 1485,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3924,\r
+        "y": 1514,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "3ee71f70.cef2d8",\r
-                "ec28887e.13052"\r
+                "a28581db.fa7cb",\r
+                "a3f78a52.db8928"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee71f70.cef2d8",\r
+        "id": "a28581db.fa7cb",\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": 4269.5,\r
+        "y": 1495,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "146e8cbe.f1427b"\r
+                "14523534.ce6de3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec28887e.13052",\r
+        "id": "a3f78a52.db8928",\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": 4273.5,\r
+        "y": 1535,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "6938dd8d.725ce4"\r
+                "2e9384b8.e29014"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "146e8cbe.f1427b",\r
+        "id": "14523534.ce6de3",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4427.5,\r
+        "y": 1495,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6938dd8d.725ce4",\r
+        "id": "2e9384b8.e29014",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4417,\r
-        "y": 1506,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4431,\r
+        "y": 1535,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              [\r
-                "3103adf.03ebdd2",\r
-                "abd5a958.8851"\r
+                "b54e7482.e242c8",\r
+                "df1f167a.857918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5e2d859.f89e48",\r
+        "id": "364ac531.cfcb5a",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3753.5,\r
-        "y": 1393,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3767.5,\r
+        "y": 1422,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3103adf.03ebdd2",\r
+        "id": "b54e7482.e242c8",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "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": 4771,\r
+        "y": 1534,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1ee5068c.50a041",\r
+        "id": "68be1db9.7e03ec",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4615,\r
-        "y": 1463,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4629,\r
+        "y": 1492,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "abd5a958.8851",\r
+        "id": "df1f167a.857918",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4686,\r
-        "y": 1554,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4700,\r
+        "y": 1583,\r
+        "z": "8a9c455f.82beb8",\r
          "wires": [\r
              []\r
          ]\r
+    },\r
+    {\r
+        "id": "57847c7b.2f3dbc",\r
+        "type": "set",\r
+        "name": "set attachment_param for OTN",\r
+        "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
+        "comments": "",\r
+        "x": 3132,\r
+        "y": 432,\r
+        "z": "8a9c455f.82beb8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b864657f.9c5a",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.vpn-binding",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
+        "comments": "",\r
+        "x": 2953,\r
+        "y": 304,\r
+        "z": "8a9c455f.82beb8",\r
+        "wires": []\r
      }\r
  ]
 \ No newline at end of file