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

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

index 9ffaaf7..d6eb686 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "d3bb30c4.60fa",\r
+        "id": "eb07fd3d.499fe",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 130,\r
-        "y": 87,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 142,\r
+        "y": 92,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d58b4202.9cdb3"\r
+                "39c5ac20.45e1d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d58b4202.9cdb3",\r
+        "id": "39c5ac20.45e1d4",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,1715 +22,2326 @@
          "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": 273.2856903076172,\r
+        "y": 141.23810863494873,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "617bde2e.1132b"\r
+                "2ea16900.365168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "617bde2e.1132b",\r
+        "id": "2ea16900.365168",\r
          "type": "method",\r
          "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
          "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 264.4286193847656,\r
-        "y": 221.00003242492676,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 276.4286193847656,\r
+        "y": 226.00003242492676,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "8ac7a60e.72d768"\r
+                "65a4788.f116c88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ac7a60e.72d768",\r
+        "id": "65a4788.f116c88",\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": 426.238037109375,\r
+        "y": 355.6666564941406,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "72b21bde.5e8f94",\r
-                "9fe7f5eb.e26c6",\r
-                "9bca10ea.41532"\r
+                "57f656d8.02c09",\r
+                "6ee54bdc.2fdd5c",\r
+                "4cf7ab90.c1f3ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "72b21bde.5e8f94",\r
+        "id": "57f656d8.02c09",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
-        "x": 682.5716552734375,\r
-        "y": 737.59716796875,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 694.5716552734375,\r
+        "y": 742.59716796875,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "441fc399.08ca9c",\r
+        "id": "d36cebd.8be9418",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 714,\r
-        "y": 412,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 726,\r
+        "y": 417,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fe7f5eb.e26c6",\r
+        "id": "6ee54bdc.2fdd5c",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 734,\r
-        "y": 508,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 746,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "926c12ae.af2a48",\r
-                "5deb4cbf.60b5f4",\r
-                "35c77549.8e65c2"\r
+                "4321e029.b0b21",\r
+                "df857197.b37508",\r
+                "caa9bf62.bc7768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "926c12ae.af2a48",\r
+        "id": "4321e029.b0b21",\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": 965,\r
+        "y": 451,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "c296586e.046f08"\r
+                "1399e348.49a41d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5deb4cbf.60b5f4",\r
+        "id": "df857197.b37508",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 962.490966796875,\r
-        "y": 488.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 974.490966796875,\r
+        "y": 493.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "bb46ff52.717af8"\r
+                "9c66f3b5.ba5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35c77549.8e65c2",\r
+        "id": "caa9bf62.bc7768",\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": 963,\r
+        "y": 540,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "236d61d5.47d9a6"\r
+                "83f89a00.0c0e7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb46ff52.717af8",\r
+        "id": "9c66f3b5.ba5a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1116.0623779296875,\r
-        "y": 491.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1128.0623779296875,\r
+        "y": 496.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "236d61d5.47d9a6",\r
+        "id": "83f89a00.0c0e7",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1120,\r
-        "y": 536,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1132,\r
+        "y": 541,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c296586e.046f08",\r
+        "id": "1399e348.49a41d",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1150,\r
-        "y": 442,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1162,\r
+        "y": 447,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b77b70ed.c591c"\r
+                "8c655e36.efa51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b77b70ed.c591c",\r
+        "id": "8c655e36.efa51",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1373.33349609375,\r
-        "y": 441.99993896484375,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1385.33349609375,\r
+        "y": 446.99993896484375,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "2fc295b4.0602da"\r
+                "dae7ff66.9b9c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2fc295b4.0602da",\r
+        "id": "dae7ff66.9b9c6",\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": 1586.0001335144043,\r
+        "y": 448.00002098083496,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "483259b4.af3e1"\r
+                "5afc15bc.b14b2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cba9b813.e1b22",\r
+        "id": "73d91f0d.979448",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3835,\r
-        "y": 162,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4405,\r
+        "y": 164,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c84632a9.494938",\r
+        "id": "53d5aef.e4ebbd",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 4486,\r
+        "y": 479,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f012f442.27b7b8",\r
-                "961e7c8c.e8988"\r
+                "ecc00da.2c7107",\r
+                "8ec5d396.327df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f012f442.27b7b8",\r
+        "id": "ecc00da.2c7107",\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": 4795.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "85de6f60.586588"\r
+                "30cb0de4.d526fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "961e7c8c.e8988",\r
+        "id": "8ec5d396.327df",\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": 4800.5,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b3e28f35.f331c"\r
+                "d98d92f9.c81fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85de6f60.586588",\r
+        "id": "30cb0de4.d526fa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4971.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3e28f35.f331c",\r
+        "id": "d98d92f9.c81fa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4397,\r
-        "y": 511,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4967,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9e9578a4.5a4df",\r
+        "id": "b72def38.869578",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 3782.5,\r
-        "y": 665,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4352.5,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d5f5723.afac28",\r
+        "id": "61d206ce.c84cc",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 4506.5,\r
+        "y": 715,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7efa3090.e1e078",\r
-                "602bb58a.eb8054"\r
+                "4c218232.9ff344",\r
+                "70cfc429.d9d73c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7efa3090.e1e078",\r
+        "id": "4c218232.9ff344",\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": 4852,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d892eebe.cdbb5"\r
+                "508ab9bd.6f59b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "602bb58a.eb8054",\r
+        "id": "70cfc429.d9d73c",\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": 4856,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "34660646.412fea"\r
+                "4484b215.bd52a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d892eebe.cdbb5",\r
+        "id": "508ab9bd.6f59b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 5010,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "34660646.412fea",\r
+        "id": "4484b215.bd52a4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4443.5,\r
-        "y": 734,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5013.5,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "63e48280.b2cb84",\r
-                "ffe3929d.a2fda"\r
+                "d5eb1314.bae0c8",\r
+                "10b6b358.4dd2d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bae980db.b9d408",\r
+        "id": "1158b528.feaadb",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3780,\r
-        "y": 621,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4350,\r
+        "y": 623,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63e48280.b2cb84",\r
+        "id": "d5eb1314.bae0c8",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4774,\r
-        "y": 699,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5344,\r
+        "y": 701,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2bc3079a.d7dde",\r
+        "id": "4e452bee.48e2ac",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4638,\r
-        "y": 658,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5208,\r
+        "y": 660,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffe3929d.a2fda",\r
+        "id": "10b6b358.4dd2d5",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4701,\r
-        "y": 745,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5271,\r
+        "y": 747,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f01334b4.1d8928",\r
+        "id": "cdb19fe7.3fcc18",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3773,\r
-        "y": 210,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4343,\r
+        "y": 212,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbf99a2b.67c71",\r
+        "id": "83225463.070fc",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3799,\r
-        "y": 327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4369,\r
+        "y": 329,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "27a62f4.f17ab5",\r
-                "1aa65c21.28f974",\r
-                "a732e62d.9d3f9"\r
+                "c77a135e.0cf11",\r
+                "733c4b21.b0276c",\r
+                "dfbdc2b7.10d7d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27a62f4.f17ab5",\r
+        "id": "c77a135e.0cf11",\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": 4564.5001220703125,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b04b9242.14b66"\r
+                "fc1575d4.07ce9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1aa65c21.28f974",\r
+        "id": "733c4b21.b0276c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3986.5001220703125,\r
-        "y": 334,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4556.5001220703125,\r
+        "y": 336,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5b188d77.8ffc8c"\r
+                "2d634f91.a839c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b04b9242.14b66",\r
+        "id": "fc1575d4.07ce9",\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": 4708.8824462890625,\r
+        "y": 280.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "14763204.df94c6"\r
+                "26c3005d.c41c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a517ec9b.cf8fc8",\r
+        "id": "fb614f2c.314568",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4721,\r
-        "y": 281,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5291,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "37ce34d7.e5314c"\r
+                "5511aade.71874c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14763204.df94c6",\r
+        "id": "26c3005d.c41c58",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4323,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4893,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "bbbe4e04.e26da"\r
+                "d1afc9f2.3db068"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bbbe4e04.e26da",\r
+        "id": "d1afc9f2.3db068",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4518,\r
-        "y": 277,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5088,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a517ec9b.cf8fc8"\r
+                "fb614f2c.314568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a732e62d.9d3f9",\r
+        "id": "dfbdc2b7.10d7d",\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": 4561.5001220703125,\r
+        "y": 393,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ebcd1e8f.a8cb18"\r
+                "1874b649.d37aaa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebcd1e8f.a8cb18",\r
+        "id": "1874b649.d37aaa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4143.5001220703125,\r
-        "y": 392,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4713.5001220703125,\r
+        "y": 394,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5b188d77.8ffc8c",\r
+        "id": "2d634f91.a839c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4154.5001220703125,\r
-        "y": 335,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4724.5001220703125,\r
+        "y": 337,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d99536cb.cbc39",\r
+        "id": "37df0014.a385b",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5106,\r
-        "y": 294,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5676,\r
+        "y": 296,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5f8e12fe.363034",\r
-                "3e541a04.379ece",\r
-                "5e7e63a7.7acdcc"\r
+                "43de30da.db75e8",\r
+                "e5ad5cbe.572928",\r
+                "12e2c219.e2a25e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37ce34d7.e5314c",\r
+        "id": "5511aade.71874c",\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": 5470,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "17ccdbf.84352a4",\r
-                "d99536cb.cbc39"\r
+                "29681795.e63f18",\r
+                "37df0014.a385b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17ccdbf.84352a4",\r
+        "id": "29681795.e63f18",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5136,\r
-        "y": 242,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5706,\r
+        "y": 244,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5f8e12fe.363034",\r
+        "id": "43de30da.db75e8",\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": 5886,\r
+        "y": 287,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a674bdd4.cbe5f"\r
+                "9fb5e37f.eaa9f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e541a04.379ece",\r
+        "id": "e5ad5cbe.572928",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5308,\r
-        "y": 340,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5878,\r
+        "y": 342,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b14ed6a2.e3874"\r
+                "24f5f29e.218576"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e7e63a7.7acdcc",\r
+        "id": "12e2c219.e2a25e",\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": 5883,\r
+        "y": 399,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "1ce96021.1d8b"\r
+                "cd568772.16e428"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ce96021.1d8b",\r
+        "id": "cd568772.16e428",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5465,\r
-        "y": 398,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6035,\r
+        "y": 400,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b14ed6a2.e3874",\r
+        "id": "24f5f29e.218576",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5476,\r
-        "y": 343,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6046,\r
+        "y": 345,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a674bdd4.cbe5f",\r
+        "id": "9fb5e37f.eaa9f",\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": 6030.38232421875,\r
+        "y": 284.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "67e87cc0.72543c"\r
+                "2b11e0ba.ac6cd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67e87cc0.72543c",\r
+        "id": "2b11e0ba.ac6cd8",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5675,\r
-        "y": 279,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 6245,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9bca10ea.41532",\r
+        "id": "4cf7ab90.c1f3ec",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 700,\r
-        "y": 456,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 712,\r
+        "y": 461,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9469a92e.1082c",\r
+        "id": "fec1365a.907b4",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
-        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3815,\r
-        "y": 966,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3812,\r
+        "y": 1621,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e72aaca.f223b8",\r
+        "id": "eb21cc8f.003df8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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": 3875,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "4967c60e.7eec88",\r
-                "d728c3b6.b72d4"\r
+                "fc655ff.669232",\r
+                "dfbdc395.b4aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4967c60e.7eec88",\r
+        "id": "fc655ff.669232",\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": 4170.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "957f3c62.36bab"\r
+                "d2ad58a1.dbb57"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d728c3b6.b72d4",\r
+        "id": "dfbdc395.b4aa",\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": 4175.5,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "9b37bb11.43c248"\r
+                "43fba27a.3e8bd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "957f3c62.36bab",\r
+        "id": "d2ad58a1.dbb57",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4338.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b37bb11.43c248",\r
+        "id": "43fba27a.3e8bd4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4352,\r
-        "y": 1327,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4349,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24fc86b.f179cfa",\r
+        "id": "a7e92939.08a52",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3754,\r
-        "y": 1023,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3751,\r
+        "y": 1678,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4e80e5.b17c0f",\r
+        "id": "25024bed.781cdc",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3774,\r
-        "y": 1120,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3771,\r
+        "y": 1775,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d87e44a4.312df",\r
-                "c39adf70.78fbd",\r
-                "ae2b50d9.d9592"\r
+                "17a289eb.8378c6",\r
+                "4e86abed.341d6c",\r
+                "9944c222.7ecb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d87e44a4.312df",\r
+        "id": "17a289eb.8378c6",\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": 3973.5001220703125,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "1f01bb4d.6d662d"\r
+                "2250bf3f.3fcd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c39adf70.78fbd",\r
+        "id": "4e86abed.341d6c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3968.5001220703125,\r
-        "y": 1128,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3965.5001220703125,\r
+        "y": 1783,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7e32fa48.cb95e4"\r
+                "7fe7998e.7db16"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f01bb4d.6d662d",\r
+        "id": "2250bf3f.3fcd88",\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": 4117.8824462890625,\r
+        "y": 1725.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "71c66ab3.44665c"\r
+                "19367b54.5d4395"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "71c66ab3.44665c",\r
+        "id": "19367b54.5d4395",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4305,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4302,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "7900c812.a2abd"\r
+                "e137d17b.53afd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae2b50d9.d9592",\r
+        "id": "9944c222.7ecb4",\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": 3970.5001220703125,\r
+        "y": 1840,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "c7f28bc4.db74a"\r
+                "c7e8bb41.e69fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7f28bc4.db74a",\r
+        "id": "c7e8bb41.e69fc8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4125.5001220703125,\r
-        "y": 1186,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4122.5001220703125,\r
+        "y": 1841,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e32fa48.cb95e4",\r
+        "id": "7fe7998e.7db16",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4136.5001220703125,\r
-        "y": 1131,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4133.5001220703125,\r
+        "y": 1786,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d3528946.ee7a88",\r
+        "id": "18a3ba34.8443fe",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4703,\r
-        "y": 1089,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4700,\r
+        "y": 1744,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "746ece73.5c4d48"\r
+                "cca686b1.a86b48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7900c812.a2abd",\r
+        "id": "e137d17b.53afd",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4500,\r
-        "y": 1085,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4497,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d3528946.ee7a88"\r
+                "18a3ba34.8443fe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8459d33.082c4",\r
+        "id": "ec259c93.12e46",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5088,\r
-        "y": 1088,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5085,\r
+        "y": 1743,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "652db70b.f69af",\r
-                "cd87b694.170a2",\r
-                "e10452ec.f851f"\r
+                "cf9d2f3.18e805",\r
+                "1901d45c.9387cc",\r
+                "86a361e1.5f9008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "746ece73.5c4d48",\r
+        "id": "cca686b1.a86b48",\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": 4877,\r
+        "y": 1736,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "13e8c9be.60d2ee",\r
-                "f8459d33.082c4"\r
+                "2d219530.71913a",\r
+                "ec259c93.12e46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13e8c9be.60d2ee",\r
+        "id": "2d219530.71913a",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5118,\r
-        "y": 1036,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5115,\r
+        "y": 1691,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "64b1d1df.af4928",\r
+        "id": "bb17bcb1.afece8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5447,\r
-        "y": 1192,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5444,\r
+        "y": 1847,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "afae5d5f.cf8cd8",\r
+        "id": "e71302c9.0e3fc8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5458,\r
-        "y": 1137,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5455,\r
+        "y": 1792,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe8767e6.75d1",\r
+        "id": "c367d2df.137348",\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": 5439.38232421875,\r
+        "y": 1731.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "9e679808.748fd"\r
+                "bfc16252.e05aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e679808.748fd",\r
+        "id": "bfc16252.e05aa",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5657,\r
-        "y": 1073,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5654,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "652db70b.f69af",\r
+        "id": "cf9d2f3.18e805",\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": 5295,\r
+        "y": 1734,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "fe8767e6.75d1"\r
+                "c367d2df.137348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd87b694.170a2",\r
+        "id": "1901d45c.9387cc",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5290,\r
-        "y": 1134,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 5287,\r
+        "y": 1789,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "afae5d5f.cf8cd8"\r
+                "e71302c9.0e3fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e10452ec.f851f",\r
+        "id": "86a361e1.5f9008",\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": 5292,\r
+        "y": 1846,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "64b1d1df.af4928"\r
+                "bb17bcb1.afece8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "483259b4.af3e1",\r
+        "id": "5afc15bc.b14b2c",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1812,\r
-        "y": 445,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 1824,\r
+        "y": 450,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "deb24009.8fcaa8",\r
-                "f99db731.cec29",\r
-                "20c66e63.50491a"\r
+                "c4ea2f12.0682f8",\r
+                "89ba984f.fbff08",\r
+                "4c31ddac.b140a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "deb24009.8fcaa8",\r
+        "id": "c4ea2f12.0682f8",\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": 2032,\r
+        "y": 414,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "4730a3bd.f32424"\r
+                "207f18a3.1780c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99db731.cec29",\r
+        "id": "89ba984f.fbff08",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2020.490966796875,\r
-        "y": 454.57403564453125,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2032.490966796875,\r
+        "y": 459.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "5f621d7d.168d04"\r
+                "db0bb70b.5af75"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20c66e63.50491a",\r
+        "id": "4c31ddac.b140a4",\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": 2030,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3d808fc9.409a"\r
+                "34efc961.392a36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f621d7d.168d04",\r
+        "id": "db0bb70b.5af75",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2183.0623779296875,\r
-        "y": 454.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2195.0623779296875,\r
+        "y": 459.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3d808fc9.409a",\r
+        "id": "34efc961.392a36",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2187,\r
-        "y": 499,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2199,\r
+        "y": 504,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bf7163.623b18",\r
+        "id": "da2f8124.076ab8",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2493,\r
-        "y": 498,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2505,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "4a10f363.97f04c",\r
-                "75240e64.8364b",\r
-                "7a8b2677.1e3f6"\r
+                "28f88824.b7c4b8",\r
+                "d6ad8583.7ca128",\r
+                "c9e967f5.e899f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "262c25a6.ad70a2",\r
+        "id": "f459c148.932bf8",\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": 2885,\r
+        "y": 591,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "471d55bd.ad492c"\r
+                "1c6e3351.8ccb0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a10f363.97f04c",\r
+        "id": "28f88824.b7c4b8",\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": 2716,\r
+        "y": 592,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "262c25a6.ad70a2"\r
+                "f459c148.932bf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75240e64.8364b",\r
+        "id": "d6ad8583.7ca128",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2704.490966796875,\r
-        "y": 545.5740356445312,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2718.490966796875,\r
+        "y": 487.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "1484cf74.c39e71"\r
+                "ef5820a6.09d9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a8b2677.1e3f6",\r
+        "id": "c9e967f5.e899f8",\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": 2714,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "d377f001.ff927"\r
+                "bd9d5fad.2d262"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d377f001.ff927",\r
+        "id": "bd9d5fad.2d262",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2869,\r
-        "y": 588,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2882,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1484cf74.c39e71",\r
+        "id": "ef5820a6.09d9d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2867.0623779296875,\r
-        "y": 545.8597717285156,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2881.0625,\r
+        "y": 486.8597412109375,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4730a3bd.f32424",\r
+        "id": "207f18a3.1780c8",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2221,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2233,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "ed79cbad.42008"\r
+                "208bed02.1187fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed79cbad.42008",\r
+        "id": "208bed02.1187fa",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2426,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2438,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "87636f23.10a238"\r
+                "f005e0a8.cc7dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87636f23.10a238",\r
+        "id": "f005e0a8.cc7dc8",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2592,\r
-        "y": 404,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 2604,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "f49319bb.999b88"\r
+                "51d187ad.ad3078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f49319bb.999b88",\r
+        "id": "51d187ad.ad3078",\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": 2767,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "98bf7163.623b18"\r
+                "da2f8124.076ab8",\r
+                "1e447cc1.915cb3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "471d55bd.ad492c",\r
+        "id": "aecb0c53.70b3e8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3131,\r
-        "y": 497,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3326,\r
+        "y": 692,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a6851b6e.131e78",\r
-                "f997812a.bb5bf"\r
+                "45f40514.0a111c",\r
+                "e5457af4.842818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6851b6e.131e78",\r
+        "id": "45f40514.0a111c",\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": 3540,\r
+        "y": 729,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "9ec23d9e.f5fd3"\r
+                "4c5d5e83.4b55d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f997812a.bb5bf",\r
+        "id": "e5457af4.842818",\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": 3542,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "a48cbe42.98bbb"\r
+                "d204a9f5.cb1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ec23d9e.f5fd3",\r
+        "id": "4c5d5e83.4b55d8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3123,\r
-        "y": 1317,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3120,\r
+        "y": 1972,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "12733247.02817e",\r
-                "457dfc0a.58968c"\r
+                "e25a0aae.dc3b6",\r
+                "5811aab2.c9cdb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12733247.02817e",\r
+        "id": "e25a0aae.dc3b6",\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": 3373,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "13d35870.d79cf8"\r
+                "e2283676.c05cf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "457dfc0a.58968c",\r
+        "id": "5811aab2.c9cdb4",\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": 3373,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "b272db0a.663f1"\r
+                "5f1f11a6.4b622"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13d35870.d79cf8",\r
+        "id": "e2283676.c05cf8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3527,\r
-        "y": 1351,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3524,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d316857d.f41628",\r
+        "id": "ef6002a3.a9265",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 3830,\r
-        "y": 102,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4400,\r
+        "y": 104,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3accaf74.7f8a68",\r
+        "id": "d11d0786.01d8c8",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3811,\r
-        "y": 908,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3808,\r
+        "y": 1563,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a48cbe42.98bbb",\r
+        "id": "4923e79.d3d2a98",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3552,\r
-        "y": 477,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4091,\r
+        "y": 361,\r
+        "z": "f351885d.7dcd3",\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
+                "ef6002a3.a9265",\r
+                "73d91f0d.979448",\r
+                "cdb19fe7.3fcc18",\r
+                "83225463.070fc",\r
+                "b72def38.869578",\r
+                "61d206ce.c84cc",\r
+                "53d5aef.e4ebbd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b272db0a.663f1",\r
+        "id": "5f1f11a6.4b622",\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": 3524,\r
+        "y": 1949,\r
+        "z": "f351885d.7dcd3",\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
+                "d11d0786.01d8c8",\r
+                "fec1365a.907b4",\r
+                "a7e92939.08a52",\r
+                "25024bed.781cdc",\r
+                "eb21cc8f.003df8",\r
+                "1be8ac25.0620fc",\r
+                "6fb79d87.420834"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6e17b735.11933",\r
+        "id": "1be8ac25.0620fc",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3756,\r
-        "y": 1437,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3753,\r
+        "y": 2092,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "35d8443b.290754",\r
+        "id": "6fb79d87.420834",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3910,\r
-        "y": 1485,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3907,\r
+        "y": 2140,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3ee71f70.cef2d8",\r
-                "ec28887e.13052"\r
+                "6175c964.8889d",\r
+                "add709ae.0740f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee71f70.cef2d8",\r
+        "id": "6175c964.8889d",\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": 4252.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "146e8cbe.f1427b"\r
+                "7caa2ba7.6bf4dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec28887e.13052",\r
+        "id": "add709ae.0740f",\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": 4256.5,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "6938dd8d.725ce4"\r
+                "43eb2ee.41b33d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "146e8cbe.f1427b",\r
+        "id": "7caa2ba7.6bf4dc",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create 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": 4410.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6938dd8d.725ce4",\r
+        "id": "43eb2ee.41b33d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4417,\r
-        "y": 1506,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4414,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              [\r
-                "3103adf.03ebdd2",\r
-                "abd5a958.8851"\r
+                "30f33337.055d14",\r
+                "948532eb.e6c7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5e2d859.f89e48",\r
+        "id": "bc6f9b2b.7321f",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3753.5,\r
-        "y": 1393,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 3750.5,\r
+        "y": 2048,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3103adf.03ebdd2",\r
+        "id": "30f33337.055d14",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4757,\r
-        "y": 1505,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4754,\r
+        "y": 2160,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1ee5068c.50a041",\r
+        "id": "227afae6.b4c94e",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4615,\r
-        "y": 1463,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4612,\r
+        "y": 2118,\r
+        "z": "f351885d.7dcd3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "abd5a958.8851",\r
+        "id": "948532eb.e6c7c",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4686,\r
-        "y": 1554,\r
-        "z": "bc9d969b.328b8",\r
+        "x": 4683,\r
+        "y": 2209,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "55624da8.df976c",\r
+        "type": "set",\r
+        "name": "set attachment_param (gfp-n) for OTN",\r
+        "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
+        "comments": "",\r
+        "x": 3317,\r
+        "y": 632,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1e447cc1.915cb3",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.vpn-binding",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
+        "comments": "",\r
+        "x": 2951,\r
+        "y": 280,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f396e52b.35559",\r
+        "type": "comment",\r
+        "name": "only dst ttp exists. No src",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3912,\r
+        "y": 318,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "72b06eec.578eb8",\r
+        "type": "comment",\r
+        "name": "only src ttp exists. No dst",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3469,\r
+        "y": 1896,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d204a9f5.cb1f",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding has src-access-ltp",\r
+        "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3648,\r
+        "y": 480,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "7da55af.10937a4",\r
+                "d30ba4e8.997a68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d30ba4e8.997a68",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3890,\r
+        "y": 1069,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "b0909b7a.d37638"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7da55af.10937a4",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3884,\r
+        "y": 360,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "4923e79.d3d2a98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b0909b7a.d37638",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4048,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "aadf2b5c.a1838",\r
+                "8fb5b52a.4e2ae",\r
+                "a006da1c.c23038",\r
+                "7e67d000.77abb",\r
+                "23d1e7d8.976258"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8fb5b52a.4e2ae",\r
+        "type": "set",\r
+        "name": "set attachment_param for OTN G",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
+        "comments": "",\r
+        "x": 4312,\r
+        "y": 951,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "23d1e7d8.976258",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4393,\r
+        "y": 1266,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c8d598bd.cbc8e",\r
+                "c93ae11e.1c54c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8d598bd.cbc8e",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4702.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "a086276f.4222f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c93ae11e.1c54c8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4707.5,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "51323b7.caecec4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a086276f.4222f8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
+        "comments": "",\r
+        "x": 4878.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "51323b7.caecec4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4874,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a006da1c.c23038",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 4250,\r
+        "y": 999,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e67d000.77abb",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4276,\r
+        "y": 1116,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ec2bb2c1.50dad",\r
+                "6fe2c398.ccd7b4",\r
+                "2cf209f9.a94e2e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ec2bb2c1.50dad",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4471.5001220703125,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "e5c84b9e.98975"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6fe2c398.ccd7b4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4463.5001220703125,\r
+        "y": 1123,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "be59a3.0881066"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5c84b9e.98975",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4615.8824462890625,\r
+        "y": 1067.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "40635ccb.0881a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "40635ccb.0881a4",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4800,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ff02a9b.ff8ffd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ff02a9b.ff8ffd8",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4995,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d3d180f4.36fa68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2cf209f9.a94e2e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4468.5001220703125,\r
+        "y": 1180,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "2b5a1252.216fe6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2b5a1252.216fe6",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4620.5001220703125,\r
+        "y": 1181,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "be59a3.0881066",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4631.5001220703125,\r
+        "y": 1124,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "aadf2b5c.a1838",\r
+        "type": "set",\r
+        "name": "set vpn-bindingG and connectivityG",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
+        "comments": "",\r
+        "x": 4307,\r
+        "y": 891,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d3d180f4.36fa68",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5198,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "8355bb98.2142e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d998285a.8338c",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5583,\r
+        "y": 1083,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "38daac86.dbf464",\r
+                "21dc6947.7d9bae",\r
+                "a47aca30.5160e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8355bb98.2142e8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5377,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "583e9682.750428",\r
+                "d998285a.8338c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "583e9682.750428",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainG id",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5613,\r
+        "y": 1031,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "38daac86.dbf464",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5793,\r
+        "y": 1074,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "10b34ad5.e58d9d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "21dc6947.7d9bae",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5785,\r
+        "y": 1129,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "6ce9bc65.05009c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a47aca30.5160e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5790,\r
+        "y": 1186,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "18239e9b.852729"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "18239e9b.852729",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5942,\r
+        "y": 1187,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6ce9bc65.05009c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5953,\r
+        "y": 1132,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10b34ad5.e58d9d",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5937.38232421875,\r
+        "y": 1071.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d4058b68.bd8818"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4058b68.bd8818",\r
+        "type": "set",\r
+        "name": "set controller domainG data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 6152,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3a09f359.556f04",\r
+        "type": "comment",\r
+        "name": "both src and dst exist",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3926,\r
+        "y": 1009,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1c6e3351.8ccb0d",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
+        "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2488,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "91c41639.2357b",\r
+                "5aa31f25.4b2718"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5aa31f25.4b2718",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 754,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "49ef7599.6e682c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91c41639.2357b",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 699,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c7ffb45b.775578"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c7ffb45b.775578",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3051,\r
+        "y": 697,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "55624da8.df976c",\r
+                "aecb0c53.70b3e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49ef7599.6e682c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3028,\r
+        "y": 755,\r
+        "z": "f351885d.7dcd3",\r
          "wires": [\r
              []\r
          ]\r