Bug fixing required for integration testing with PCE.

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

index d6eb686..02a760d 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "eb07fd3d.499fe",\r
+        "id": "acf9e544.d632d8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 142,\r
-        "y": 92,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 130,\r
+        "y": 80,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "39c5ac20.45e1d4"\r
+                "ca913714.8e299"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39c5ac20.45e1d4",\r
+        "id": "ca913714.8e299",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,2326 +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": 273.2856903076172,\r
-        "y": 141.23810863494873,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 261.2856903076172,\r
+        "y": 129.23810863494873,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2ea16900.365168"\r
+                "fb417168.600308"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ea16900.365168",\r
+        "id": "fb417168.600308",\r
          "type": "method",\r
          "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
          "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 276.4286193847656,\r
-        "y": 226.00003242492676,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 264.4286193847656,\r
+        "y": 214.00003242492676,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "65a4788.f116c88"\r
+                "b8f0421e.565ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65a4788.f116c88",\r
+        "id": "b8f0421e.565ff8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 426.238037109375,\r
-        "y": 355.6666564941406,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 414.238037109375,\r
+        "y": 343.6666564941406,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "57f656d8.02c09",\r
-                "6ee54bdc.2fdd5c",\r
-                "4cf7ab90.c1f3ec"\r
+                "77ab8d82.d7040c",\r
+                "161b3712.e40a99",\r
+                "441438f3.47d108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57f656d8.02c09",\r
+        "id": "77ab8d82.d7040c",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
-        "x": 694.5716552734375,\r
-        "y": 742.59716796875,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 682.5716552734375,\r
+        "y": 730.59716796875,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d36cebd.8be9418",\r
+        "id": "cd3b0e66.721858",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 726,\r
-        "y": 417,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 714,\r
+        "y": 405,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ee54bdc.2fdd5c",\r
+        "id": "161b3712.e40a99",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 746,\r
-        "y": 513,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 734,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4321e029.b0b21",\r
-                "df857197.b37508",\r
-                "caa9bf62.bc7768"\r
+                "a50bfd24.6ac44",\r
+                "3bd3a68e.896b3a",\r
+                "320764b6.9fa15c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4321e029.b0b21",\r
+        "id": "a50bfd24.6ac44",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 965,\r
-        "y": 451,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 953,\r
+        "y": 439,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1399e348.49a41d"\r
+                "b122e042.5ab94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "df857197.b37508",\r
+        "id": "3bd3a68e.896b3a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 974.490966796875,\r
-        "y": 493.57403564453125,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 962.490966796875,\r
+        "y": 481.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9c66f3b5.ba5a"\r
+                "4e666373.42b6cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "caa9bf62.bc7768",\r
+        "id": "320764b6.9fa15c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 963,\r
-        "y": 540,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 951,\r
+        "y": 528,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "83f89a00.0c0e7"\r
+                "422b64b3.e06004"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c66f3b5.ba5a",\r
+        "id": "4e666373.42b6cc",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1128.0623779296875,\r
-        "y": 496.8597717285156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1116.0623779296875,\r
+        "y": 484.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "83f89a00.0c0e7",\r
+        "id": "422b64b3.e06004",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1132,\r
-        "y": 541,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1120,\r
+        "y": 529,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1399e348.49a41d",\r
+        "id": "b122e042.5ab94",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1162,\r
-        "y": 447,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1150,\r
+        "y": 435,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "8c655e36.efa51"\r
+                "111942fe.354315"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c655e36.efa51",\r
+        "id": "111942fe.354315",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1385.33349609375,\r
-        "y": 446.99993896484375,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1373.33349609375,\r
+        "y": 434.99993896484375,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "dae7ff66.9b9c6"\r
+                "ff15f851.7a7528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dae7ff66.9b9c6",\r
+        "id": "ff15f851.7a7528",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1586.0001335144043,\r
-        "y": 448.00002098083496,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1574.0001335144043,\r
+        "y": 436.00002098083496,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5afc15bc.b14b2c"\r
+                "cf901b65.835fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "73d91f0d.979448",\r
+        "id": "72376cd1.cdcaec",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-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": 4405,\r
-        "y": 164,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4393,\r
+        "y": 152,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "53d5aef.e4ebbd",\r
+        "id": "2a89aa53.8890b6",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4486,\r
-        "y": 479,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4474,\r
+        "y": 467,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ecc00da.2c7107",\r
-                "8ec5d396.327df"\r
+                "40316706.17eb48",\r
+                "6c473f1b.946a08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ecc00da.2c7107",\r
+        "id": "40316706.17eb48",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4795.5,\r
-        "y": 448,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4783.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "30cb0de4.d526fa"\r
+                "aea69973.33e85"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ec5d396.327df",\r
+        "id": "6c473f1b.946a08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4800.5,\r
-        "y": 513,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4788.5,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d98d92f9.c81fa"\r
+                "d21a082d.2cad68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30cb0de4.d526fa",\r
+        "id": "aea69973.33e85",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4971.5,\r
-        "y": 448,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4959.5,\r
+        "y": 436,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d98d92f9.c81fa",\r
+        "id": "d21a082d.2cad68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4967,\r
-        "y": 513,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4955,\r
+        "y": 501,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b72def38.869578",\r
+        "id": "de94f6d4.eda0e",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='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": 4352.5,\r
-        "y": 667,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4340.5,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "61d206ce.c84cc",\r
+        "id": "342bfbf3.ee642c",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4506.5,\r
-        "y": 715,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4494.5,\r
+        "y": 703,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4c218232.9ff344",\r
-                "70cfc429.d9d73c"\r
+                "8236b8ec.5fd17",\r
+                "51c5e2c3.871744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c218232.9ff344",\r
+        "id": "8236b8ec.5fd17",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4852,\r
-        "y": 696,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4840,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "508ab9bd.6f59b"\r
+                "b89e8953.c6ac88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70cfc429.d9d73c",\r
+        "id": "51c5e2c3.871744",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4856,\r
-        "y": 736,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4844,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4484b215.bd52a4"\r
+                "933ba47e.14e65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "508ab9bd.6f59b",\r
+        "id": "b89e8953.c6ac88",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 5010,\r
-        "y": 696,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4998,\r
+        "y": 684,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4484b215.bd52a4",\r
+        "id": "933ba47e.14e65",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5013.5,\r
-        "y": 736,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5001.5,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d5eb1314.bae0c8",\r
-                "10b6b358.4dd2d5"\r
+                "363131ab.be28b6",\r
+                "fcee3485.dea4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1158b528.feaadb",\r
+        "id": "776cbd7.844f0c4",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 4350,\r
-        "y": 623,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4338,\r
+        "y": 611,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d5eb1314.bae0c8",\r
+        "id": "363131ab.be28b6",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5344,\r
-        "y": 701,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5332,\r
+        "y": 689,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4e452bee.48e2ac",\r
+        "id": "d8ba5ee6.a5736",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 5208,\r
-        "y": 660,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5196,\r
+        "y": 648,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10b6b358.4dd2d5",\r
+        "id": "fcee3485.dea4a",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5271,\r
-        "y": 747,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5259,\r
+        "y": 735,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cdb19fe7.3fcc18",\r
+        "id": "9b9c3cba.716c78",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4343,\r
-        "y": 212,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4331,\r
+        "y": 200,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "83225463.070fc",\r
+        "id": "5f8cf8c6.3002c8",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4369,\r
-        "y": 329,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4357,\r
+        "y": 317,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c77a135e.0cf11",\r
-                "733c4b21.b0276c",\r
-                "dfbdc2b7.10d7d"\r
+                "33823e1a.9269c2",\r
+                "b38b9e38.f8c8a8",\r
+                "9f21383a.68cb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c77a135e.0cf11",\r
+        "id": "33823e1a.9269c2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4564.5001220703125,\r
-        "y": 281,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4552.5001220703125,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "fc1575d4.07ce9"\r
+                "755b5bf3.347744"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "733c4b21.b0276c",\r
+        "id": "b38b9e38.f8c8a8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4556.5001220703125,\r
-        "y": 336,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4544.5001220703125,\r
+        "y": 324,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2d634f91.a839c8"\r
+                "5d1291bc.3b9d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fc1575d4.07ce9",\r
+        "id": "755b5bf3.347744",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4708.8824462890625,\r
-        "y": 280.6556701660156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4696.8824462890625,\r
+        "y": 268.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "26c3005d.c41c58"\r
+                "5007d6bb.a571d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb614f2c.314568",\r
+        "id": "c0da9575.eb2c6",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5291,\r
-        "y": 283,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5279,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5511aade.71874c"\r
+                "1053f3a3.2846c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26c3005d.c41c58",\r
+        "id": "5007d6bb.a571d",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4893,\r
-        "y": 279,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4881,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d1afc9f2.3db068"\r
+                "33b94d0d.c61ee2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1afc9f2.3db068",\r
+        "id": "33b94d0d.c61ee2",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5088,\r
-        "y": 279,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5076,\r
+        "y": 267,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "fb614f2c.314568"\r
+                "c0da9575.eb2c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfbdc2b7.10d7d",\r
+        "id": "9f21383a.68cb9",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4561.5001220703125,\r
-        "y": 393,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4549.5001220703125,\r
+        "y": 381,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1874b649.d37aaa"\r
+                "e621d08a.7d07a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1874b649.d37aaa",\r
+        "id": "e621d08a.7d07a8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4713.5001220703125,\r
-        "y": 394,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4701.5001220703125,\r
+        "y": 382,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2d634f91.a839c8",\r
+        "id": "5d1291bc.3b9d5",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4724.5001220703125,\r
-        "y": 337,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4712.5001220703125,\r
+        "y": 325,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "37df0014.a385b",\r
+        "id": "bace4f35.dcb4f",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5676,\r
-        "y": 296,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5664,\r
+        "y": 284,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "43de30da.db75e8",\r
-                "e5ad5cbe.572928",\r
-                "12e2c219.e2a25e"\r
+                "41428f.b99c7d7",\r
+                "92b16ebc.198be8",\r
+                "47593c0a.609b2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5511aade.71874c",\r
+        "id": "1053f3a3.2846c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5470,\r
-        "y": 283,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5458,\r
+        "y": 271,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "29681795.e63f18",\r
-                "37df0014.a385b"\r
+                "db2fdd1f.f44e1",\r
+                "bace4f35.dcb4f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29681795.e63f18",\r
+        "id": "db2fdd1f.f44e1",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5706,\r
-        "y": 244,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5694,\r
+        "y": 232,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43de30da.db75e8",\r
+        "id": "41428f.b99c7d7",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5886,\r
-        "y": 287,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5874,\r
+        "y": 275,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "9fb5e37f.eaa9f"\r
+                "d8c57966.bba2b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5ad5cbe.572928",\r
+        "id": "92b16ebc.198be8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5878,\r
-        "y": 342,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5866,\r
+        "y": 330,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "24f5f29e.218576"\r
+                "bbecf65b.0991f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12e2c219.e2a25e",\r
+        "id": "47593c0a.609b2c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5883,\r
-        "y": 399,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5871,\r
+        "y": 387,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "cd568772.16e428"\r
+                "17aa566c.ce27ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd568772.16e428",\r
+        "id": "17aa566c.ce27ba",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 6035,\r
-        "y": 400,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 6023,\r
+        "y": 388,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24f5f29e.218576",\r
+        "id": "bbecf65b.0991f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 6046,\r
-        "y": 345,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 6034,\r
+        "y": 333,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fb5e37f.eaa9f",\r
+        "id": "d8c57966.bba2b8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6030.38232421875,\r
-        "y": 284.6556701660156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 6018.38232421875,\r
+        "y": 272.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2b11e0ba.ac6cd8"\r
+                "eeaaed9f.46288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b11e0ba.ac6cd8",\r
+        "id": "eeaaed9f.46288",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6245,\r
-        "y": 281,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 6233,\r
+        "y": 269,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4cf7ab90.c1f3ec",\r
+        "id": "441438f3.47d108",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 712,\r
-        "y": 461,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 700,\r
+        "y": 449,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fec1365a.907b4",\r
+        "id": "48e88b1.fd2c9f4",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-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": 3812,\r
-        "y": 1621,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3800,\r
+        "y": 1609,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb21cc8f.003df8",\r
+        "id": "46863424.f49acc",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3875,\r
-        "y": 1950,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3863,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "fc655ff.669232",\r
-                "dfbdc395.b4aa"\r
+                "dcc57379.86dfe8",\r
+                "c898077c.fa069"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fc655ff.669232",\r
+        "id": "dcc57379.86dfe8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4170.5,\r
-        "y": 1917,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4158.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d2ad58a1.dbb57"\r
+                "abcd166d.ac4418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfbdc395.b4aa",\r
+        "id": "c898077c.fa069",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4175.5,\r
-        "y": 1982,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4163.5,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "43fba27a.3e8bd4"\r
+                "a337c775.425078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2ad58a1.dbb57",\r
+        "id": "abcd166d.ac4418",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4338.5,\r
-        "y": 1917,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4326.5,\r
+        "y": 1905,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43fba27a.3e8bd4",\r
+        "id": "a337c775.425078",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4349,\r
-        "y": 1982,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4337,\r
+        "y": 1970,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a7e92939.08a52",\r
+        "id": "402d5da7.084ecc",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3751,\r
-        "y": 1678,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3739,\r
+        "y": 1666,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25024bed.781cdc",\r
+        "id": "600572d7.37f4f4",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3771,\r
-        "y": 1775,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3759,\r
+        "y": 1763,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "17a289eb.8378c6",\r
-                "4e86abed.341d6c",\r
-                "9944c222.7ecb4"\r
+                "a75ca9d.3439f58",\r
+                "399b40eb.8cb2c",\r
+                "c23ae6cb.c49a18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17a289eb.8378c6",\r
+        "id": "a75ca9d.3439f58",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3973.5001220703125,\r
-        "y": 1728,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3961.5001220703125,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2250bf3f.3fcd88"\r
+                "7c251cdc.702f24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4e86abed.341d6c",\r
+        "id": "399b40eb.8cb2c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3965.5001220703125,\r
-        "y": 1783,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3953.5001220703125,\r
+        "y": 1771,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7fe7998e.7db16"\r
+                "9ad884c8.666098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2250bf3f.3fcd88",\r
+        "id": "7c251cdc.702f24",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4117.8824462890625,\r
-        "y": 1725.6556701660156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4105.8824462890625,\r
+        "y": 1713.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "19367b54.5d4395"\r
+                "cb9eeb5b.e8a49"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19367b54.5d4395",\r
+        "id": "cb9eeb5b.e8a49",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4302,\r
-        "y": 1740,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4290,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e137d17b.53afd"\r
+                "3d062c6c.6ff5d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9944c222.7ecb4",\r
+        "id": "c23ae6cb.c49a18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3970.5001220703125,\r
-        "y": 1840,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3958.5001220703125,\r
+        "y": 1828,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c7e8bb41.e69fc8"\r
+                "c325aab2.4755e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7e8bb41.e69fc8",\r
+        "id": "c325aab2.4755e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4122.5001220703125,\r
-        "y": 1841,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4110.5001220703125,\r
+        "y": 1829,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7fe7998e.7db16",\r
+        "id": "9ad884c8.666098",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4133.5001220703125,\r
-        "y": 1786,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4121.5001220703125,\r
+        "y": 1774,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "18a3ba34.8443fe",\r
+        "id": "34bca75e.e09988",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4700,\r
-        "y": 1744,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4688,\r
+        "y": 1732,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "cca686b1.a86b48"\r
+                "edc0cd69.586d38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e137d17b.53afd",\r
+        "id": "3d062c6c.6ff5d4",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4497,\r
-        "y": 1740,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4485,\r
+        "y": 1728,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "18a3ba34.8443fe"\r
+                "34bca75e.e09988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec259c93.12e46",\r
+        "id": "f5373d88.e0f4c",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5085,\r
-        "y": 1743,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5073,\r
+        "y": 1731,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "cf9d2f3.18e805",\r
-                "1901d45c.9387cc",\r
-                "86a361e1.5f9008"\r
+                "efe05c93.e4bd48",\r
+                "c004c915.8de7",\r
+                "8875f4b.bcb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cca686b1.a86b48",\r
+        "id": "edc0cd69.586d38",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4877,\r
-        "y": 1736,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4865,\r
+        "y": 1724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2d219530.71913a",\r
-                "ec259c93.12e46"\r
+                "bd388c7d.2a51e",\r
+                "f5373d88.e0f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d219530.71913a",\r
+        "id": "bd388c7d.2a51e",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5115,\r
-        "y": 1691,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5103,\r
+        "y": 1679,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bb17bcb1.afece8",\r
+        "id": "c54d67f1.3a38c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5444,\r
-        "y": 1847,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5432,\r
+        "y": 1835,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e71302c9.0e3fc8",\r
+        "id": "56448bab.caa82c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5455,\r
-        "y": 1792,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5443,\r
+        "y": 1780,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c367d2df.137348",\r
+        "id": "97f3ba34.f2dc7",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5439.38232421875,\r
-        "y": 1731.6556701660156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5427.38232421875,\r
+        "y": 1719.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bfc16252.e05aa"\r
+                "5b487de9.7c9484"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfc16252.e05aa",\r
+        "id": "5b487de9.7c9484",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5654,\r
-        "y": 1728,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5642,\r
+        "y": 1716,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cf9d2f3.18e805",\r
+        "id": "efe05c93.e4bd48",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5295,\r
-        "y": 1734,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5283,\r
+        "y": 1722,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c367d2df.137348"\r
+                "97f3ba34.f2dc7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1901d45c.9387cc",\r
+        "id": "c004c915.8de7",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5287,\r
-        "y": 1789,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5275,\r
+        "y": 1777,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e71302c9.0e3fc8"\r
+                "56448bab.caa82c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86a361e1.5f9008",\r
+        "id": "8875f4b.bcb6f88",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5292,\r
-        "y": 1846,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5280,\r
+        "y": 1834,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bb17bcb1.afece8"\r
+                "c54d67f1.3a38c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5afc15bc.b14b2c",\r
+        "id": "cf901b65.835fc8",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1824,\r
-        "y": 450,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 1812,\r
+        "y": 438,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c4ea2f12.0682f8",\r
-                "89ba984f.fbff08",\r
-                "4c31ddac.b140a4"\r
+                "a3e158df.aec638",\r
+                "28bc0271.0f9e9e",\r
+                "12a8a0b5.4084c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c4ea2f12.0682f8",\r
+        "id": "a3e158df.aec638",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2032,\r
-        "y": 414,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2020,\r
+        "y": 402,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "207f18a3.1780c8"\r
+                "8651df9.9efa52"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89ba984f.fbff08",\r
+        "id": "28bc0271.0f9e9e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2032.490966796875,\r
-        "y": 459.57403564453125,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2020.490966796875,\r
+        "y": 447.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "db0bb70b.5af75"\r
+                "b3859ee9.a63778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c31ddac.b140a4",\r
+        "id": "12a8a0b5.4084c7",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2030,\r
-        "y": 503,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2018,\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "34efc961.392a36"\r
+                "b1a3023.979458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db0bb70b.5af75",\r
+        "id": "b3859ee9.a63778",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2195.0623779296875,\r
-        "y": 459.8597717285156,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2183.0623779296875,\r
+        "y": 447.8597717285156,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "34efc961.392a36",\r
+        "id": "b1a3023.979458",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2199,\r
-        "y": 504,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2187,\r
+        "y": 492,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "da2f8124.076ab8",\r
+        "id": "e921a3d6.75f8b8",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2505,\r
-        "y": 503,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2493,\r
+        "y": 491,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "28f88824.b7c4b8",\r
-                "d6ad8583.7ca128",\r
-                "c9e967f5.e899f8"\r
+                "19de242e.79b56c",\r
+                "e1533c2.9fadc4",\r
+                "da41548.4c59da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f459c148.932bf8",\r
+        "id": "108df7f5.f0405",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2885,\r
-        "y": 591,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2873,\r
+        "y": 579,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "1c6e3351.8ccb0d"\r
+                "19520422.b45d4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28f88824.b7c4b8",\r
+        "id": "19de242e.79b56c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2716,\r
-        "y": 592,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2704,\r
+        "y": 580,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f459c148.932bf8"\r
+                "108df7f5.f0405"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6ad8583.7ca128",\r
+        "id": "e1533c2.9fadc4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2718.490966796875,\r
-        "y": 487.57403564453125,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2706.490966796875,\r
+        "y": 475.57403564453125,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ef5820a6.09d9d"\r
+                "efbdd7a3.5958d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9e967f5.e899f8",\r
+        "id": "da41548.4c59da8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2714,\r
-        "y": 532,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2702,\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "bd9d5fad.2d262"\r
+                "e03f3a11.4be118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd9d5fad.2d262",\r
+        "id": "e03f3a11.4be118",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2882,\r
-        "y": 532,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2870,\r
+        "y": 520,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef5820a6.09d9d",\r
+        "id": "efbdd7a3.5958d8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2881.0625,\r
-        "y": 486.8597412109375,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2869.0625,\r
+        "y": 474.8597412109375,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "207f18a3.1780c8",\r
+        "id": "8651df9.9efa52",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2233,\r
-        "y": 409,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2221,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "208bed02.1187fa"\r
+                "6856373e.df8d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "208bed02.1187fa",\r
+        "id": "6856373e.df8d5",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2438,\r
-        "y": 409,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2426,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "f005e0a8.cc7dc8"\r
+                "61b4f44b.e9282c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f005e0a8.cc7dc8",\r
+        "id": "61b4f44b.e9282c",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2604,\r
-        "y": 409,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2592,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "51d187ad.ad3078"\r
+                "9aa1bdef.a85148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51d187ad.ad3078",\r
+        "id": "9aa1bdef.a85148",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2767,\r
-        "y": 409,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2755,\r
+        "y": 397,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "da2f8124.076ab8",\r
-                "1e447cc1.915cb3"\r
+                "e921a3d6.75f8b8",\r
+                "8b7a547c.5a78f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aecb0c53.70b3e8",\r
+        "id": "61cd75bc.541bfc",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3326,\r
-        "y": 692,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3314,\r
+        "y": 680,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "45f40514.0a111c",\r
-                "e5457af4.842818"\r
+                "ce7e100e.65e8d8",\r
+                "978d0324.53a218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "45f40514.0a111c",\r
+        "id": "ce7e100e.65e8d8",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3540,\r
-        "y": 729,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3528,\r
+        "y": 717,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4c5d5e83.4b55d8"\r
+                "d3a9cf8b.6d8898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5457af4.842818",\r
+        "id": "978d0324.53a218",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3542,\r
-        "y": 667,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3530,\r
+        "y": 655,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d204a9f5.cb1f"\r
+                "eacef09.695731"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c5d5e83.4b55d8",\r
+        "id": "d3a9cf8b.6d8898",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3120,\r
-        "y": 1972,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3108,\r
+        "y": 1960,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e25a0aae.dc3b6",\r
-                "5811aab2.c9cdb4"\r
+                "a298a9c0.8f44e8",\r
+                "ca55eca6.1cb808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e25a0aae.dc3b6",\r
+        "id": "a298a9c0.8f44e8",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3373,\r
-        "y": 2006,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3361,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e2283676.c05cf8"\r
+                "c785caf0.121d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5811aab2.c9cdb4",\r
+        "id": "ca55eca6.1cb808",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3373,\r
-        "y": 1950,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3361,\r
+        "y": 1938,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "5f1f11a6.4b622"\r
+                "6d0b6c95.2359f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2283676.c05cf8",\r
+        "id": "c785caf0.121d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3524,\r
-        "y": 2006,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3512,\r
+        "y": 1994,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef6002a3.a9265",\r
+        "id": "2abfc3f7.2295e4",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4400,\r
-        "y": 104,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4388,\r
+        "y": 92,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d11d0786.01d8c8",\r
+        "id": "ebb770b7.bb1a4",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3808,\r
-        "y": 1563,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3796,\r
+        "y": 1551,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4923e79.d3d2a98",\r
+        "id": "bcb6d938.081b58",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4091,\r
-        "y": 361,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4079,\r
+        "y": 349,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ef6002a3.a9265",\r
-                "73d91f0d.979448",\r
-                "cdb19fe7.3fcc18",\r
-                "83225463.070fc",\r
-                "b72def38.869578",\r
-                "61d206ce.c84cc",\r
-                "53d5aef.e4ebbd"\r
+                "2abfc3f7.2295e4",\r
+                "72376cd1.cdcaec",\r
+                "9b9c3cba.716c78",\r
+                "5f8cf8c6.3002c8",\r
+                "de94f6d4.eda0e",\r
+                "342bfbf3.ee642c",\r
+                "2a89aa53.8890b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f1f11a6.4b622",\r
+        "id": "6d0b6c95.2359f4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3524,\r
-        "y": 1949,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3512,\r
+        "y": 1937,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d11d0786.01d8c8",\r
-                "fec1365a.907b4",\r
-                "a7e92939.08a52",\r
-                "25024bed.781cdc",\r
-                "eb21cc8f.003df8",\r
-                "1be8ac25.0620fc",\r
-                "6fb79d87.420834"\r
+                "ebb770b7.bb1a4",\r
+                "48e88b1.fd2c9f4",\r
+                "402d5da7.084ecc",\r
+                "600572d7.37f4f4",\r
+                "46863424.f49acc",\r
+                "4aa8bc15.43053c",\r
+                "295ad948.4ab50e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1be8ac25.0620fc",\r
+        "id": "4aa8bc15.43053c",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='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": 3753,\r
-        "y": 2092,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3741,\r
+        "y": 2080,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6fb79d87.420834",\r
+        "id": "295ad948.4ab50e",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3907,\r
-        "y": 2140,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3895,\r
+        "y": 2128,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "6175c964.8889d",\r
-                "add709ae.0740f"\r
+                "ec9bb97a.fa7b4",\r
+                "d7a86063.21272"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6175c964.8889d",\r
+        "id": "ec9bb97a.fa7b4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4252.5,\r
-        "y": 2121,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4240.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7caa2ba7.6bf4dc"\r
+                "23e4ab97.fe6f5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "add709ae.0740f",\r
+        "id": "d7a86063.21272",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4256.5,\r
-        "y": 2161,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4244.5,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "43eb2ee.41b33d"\r
+                "3d3a171d.cfa4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7caa2ba7.6bf4dc",\r
+        "id": "23e4ab97.fe6f5c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4410.5,\r
-        "y": 2121,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4398.5,\r
+        "y": 2109,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43eb2ee.41b33d",\r
+        "id": "3d3a171d.cfa4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4414,\r
-        "y": 2161,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4402,\r
+        "y": 2149,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "30f33337.055d14",\r
-                "948532eb.e6c7c"\r
+                "5d084d8a.b2f23c",\r
+                "44dbf2a2.960644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc6f9b2b.7321f",\r
+        "id": "ce171a50.073f6",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3750.5,\r
-        "y": 2048,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3738.5,\r
+        "y": 2036,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30f33337.055d14",\r
+        "id": "5d084d8a.b2f23c",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4754,\r
-        "y": 2160,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4742,\r
+        "y": 2148,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "227afae6.b4c94e",\r
+        "id": "e7b454fe.3b5cb",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4612,\r
-        "y": 2118,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4600,\r
+        "y": 2106,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "948532eb.e6c7c",\r
+        "id": "44dbf2a2.960644",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4683,\r
-        "y": 2209,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4671,\r
+        "y": 2197,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "55624da8.df976c",\r
+        "id": "dcf1d309.aad128",\r
          "type": "set",\r
          "name": "set attachment_param (gfp-n) for OTN",\r
          "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
          "comments": "",\r
-        "x": 3317,\r
-        "y": 632,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3305,\r
+        "y": 620,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e447cc1.915cb3",\r
+        "id": "8b7a547c.5a78f8",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
          "comments": "",\r
-        "x": 2951,\r
-        "y": 280,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2939,\r
+        "y": 268,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f396e52b.35559",\r
+        "id": "29539dcf.178a92",\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
+        "x": 3900,\r
+        "y": 306,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "72b06eec.578eb8",\r
+        "id": "5f3074d9.b389cc",\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
+        "x": 3457,\r
+        "y": 1884,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d204a9f5.cb1f",\r
+        "id": "eacef09.695731",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3648,\r
-        "y": 480,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 3636,\r
+        "y": 468,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "7da55af.10937a4",\r
-                "d30ba4e8.997a68"\r
+                "f62c1164.a0b8",\r
+                "81b54f08.97d86"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d30ba4e8.997a68",\r
+        "id": "81b54f08.97d86",\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
+        "x": 3878,\r
+        "y": 1057,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "b0909b7a.d37638"\r
+                "efc62266.57c198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7da55af.10937a4",\r
+        "id": "f62c1164.a0b8",\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
+        "x": 3872,\r
+        "y": 348,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "4923e79.d3d2a98"\r
+                "bcb6d938.081b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b0909b7a.d37638",\r
+        "id": "efc62266.57c198",\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
+        "x": 4036,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "aadf2b5c.a1838",\r
-                "8fb5b52a.4e2ae",\r
-                "a006da1c.c23038",\r
-                "7e67d000.77abb",\r
-                "23d1e7d8.976258"\r
+                "cb6a953c.fa71e8",\r
+                "263d4572.ce34fa",\r
+                "2e78dd82.d5612a",\r
+                "c61e9a44.c762a8",\r
+                "8ae64ab7.a00a7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8fb5b52a.4e2ae",\r
+        "id": "263d4572.ce34fa",\r
          "type": "set",\r
          "name": "set attachment_param for OTN G",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4312,\r
-        "y": 951,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4300,\r
+        "y": 939,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "23d1e7d8.976258",\r
+        "id": "8ae64ab7.a00a7",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4393,\r
-        "y": 1266,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4381,\r
+        "y": 1254,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c8d598bd.cbc8e",\r
-                "c93ae11e.1c54c8"\r
+                "bd008f9d.f02308",\r
+                "91d1e4e0.3cbb38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8d598bd.cbc8e",\r
+        "id": "bd008f9d.f02308",\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
+        "x": 4690.5,\r
+        "y": 1223,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "a086276f.4222f8"\r
+                "270fab9f.26c71c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c93ae11e.1c54c8",\r
+        "id": "91d1e4e0.3cbb38",\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
+        "x": 4695.5,\r
+        "y": 1288,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "51323b7.caecec4"\r
+                "49e9447.128b63c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a086276f.4222f8",\r
+        "id": "270fab9f.26c71c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4878.5,\r
-        "y": 1235,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4866.5,\r
+        "y": 1223,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51323b7.caecec4",\r
+        "id": "49e9447.128b63c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4874,\r
-        "y": 1300,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4862,\r
+        "y": 1288,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a006da1c.c23038",\r
+        "id": "2e78dd82.d5612a",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4250,\r
-        "y": 999,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4238,\r
+        "y": 987,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e67d000.77abb",\r
+        "id": "c61e9a44.c762a8",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4276,\r
-        "y": 1116,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4264,\r
+        "y": 1104,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ec2bb2c1.50dad",\r
-                "6fe2c398.ccd7b4",\r
-                "2cf209f9.a94e2e"\r
+                "58640478.1eeefc",\r
+                "b15b9e00.631398",\r
+                "c5141964.109468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec2bb2c1.50dad",\r
+        "id": "58640478.1eeefc",\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
+        "x": 4459.5001220703125,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "e5c84b9e.98975"\r
+                "9ec63af5.4a1a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6fe2c398.ccd7b4",\r
+        "id": "b15b9e00.631398",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4463.5001220703125,\r
-        "y": 1123,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4451.5001220703125,\r
+        "y": 1111,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "be59a3.0881066"\r
+                "a4b9d6d5.39a2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5c84b9e.98975",\r
+        "id": "9ec63af5.4a1a88",\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
+        "x": 4603.8824462890625,\r
+        "y": 1055.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "40635ccb.0881a4"\r
+                "f086ebfd.c8405"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40635ccb.0881a4",\r
+        "id": "f086ebfd.c8405",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4800,\r
-        "y": 1066,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4788,\r
+        "y": 1054,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "ff02a9b.ff8ffd8"\r
+                "b709cf8e.43e148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff02a9b.ff8ffd8",\r
+        "id": "b709cf8e.43e148",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4995,\r
-        "y": 1066,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4983,\r
+        "y": 1054,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d3d180f4.36fa68"\r
+                "ad439d36.0ced9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cf209f9.a94e2e",\r
+        "id": "c5141964.109468",\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
+        "x": 4456.5001220703125,\r
+        "y": 1168,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "2b5a1252.216fe6"\r
+                "56d134ff.8e34ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5a1252.216fe6",\r
+        "id": "56d134ff.8e34ec",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4620.5001220703125,\r
-        "y": 1181,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4608.5001220703125,\r
+        "y": 1169,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "be59a3.0881066",\r
+        "id": "a4b9d6d5.39a2c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4631.5001220703125,\r
-        "y": 1124,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4619.5001220703125,\r
+        "y": 1112,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aadf2b5c.a1838",\r
+        "id": "cb6a953c.fa71e8",\r
          "type": "set",\r
          "name": "set vpn-bindingG and connectivityG",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4307,\r
-        "y": 891,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 4295,\r
+        "y": 879,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d3d180f4.36fa68",\r
+        "id": "ad439d36.0ced9",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5198,\r
-        "y": 1070,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5186,\r
+        "y": 1058,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "8355bb98.2142e8"\r
+                "cb537ad7.8928d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d998285a.8338c",\r
+        "id": "e839cea.58e4f3",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5583,\r
-        "y": 1083,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5571,\r
+        "y": 1071,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "38daac86.dbf464",\r
-                "21dc6947.7d9bae",\r
-                "a47aca30.5160e"\r
+                "9673ee8e.826088",\r
+                "87202e49.7cf198",\r
+                "ad5371c2.88c47"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8355bb98.2142e8",\r
+        "id": "cb537ad7.8928d8",\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
+        "x": 5365,\r
+        "y": 1058,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "583e9682.750428",\r
-                "d998285a.8338c"\r
+                "2fa33243.987c8e",\r
+                "e839cea.58e4f3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "583e9682.750428",\r
+        "id": "2fa33243.987c8e",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainG id",\r
          "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5613,\r
-        "y": 1031,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5601,\r
+        "y": 1019,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "38daac86.dbf464",\r
+        "id": "9673ee8e.826088",\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
+        "x": 5781,\r
+        "y": 1062,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "10b34ad5.e58d9d"\r
+                "3788c181.11c43e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21dc6947.7d9bae",\r
+        "id": "87202e49.7cf198",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5785,\r
-        "y": 1129,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5773,\r
+        "y": 1117,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "6ce9bc65.05009c"\r
+                "3691dbb8.1b2bf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a47aca30.5160e",\r
+        "id": "ad5371c2.88c47",\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
+        "x": 5778,\r
+        "y": 1174,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "18239e9b.852729"\r
+                "c7f3058f.182658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18239e9b.852729",\r
+        "id": "c7f3058f.182658",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5942,\r
-        "y": 1187,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5930,\r
+        "y": 1175,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ce9bc65.05009c",\r
+        "id": "3691dbb8.1b2bf4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5953,\r
-        "y": 1132,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 5941,\r
+        "y": 1120,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10b34ad5.e58d9d",\r
+        "id": "3788c181.11c43e",\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
+        "x": 5925.38232421875,\r
+        "y": 1059.6556701660156,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "d4058b68.bd8818"\r
+                "a3c8eb2b.95af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4058b68.bd8818",\r
+        "id": "a3c8eb2b.95af8",\r
          "type": "set",\r
          "name": "set controller domainG data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6152,\r
-        "y": 1068,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 6140,\r
+        "y": 1056,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3a09f359.556f04",\r
+        "id": "2ac9f039.bfa9a8",\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
+        "x": 3914,\r
+        "y": 997,\r
+        "z": "4996e636.3ea08",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c6e3351.8ccb0d",\r
+        "id": "19520422.b45d4c",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2488,\r
-        "y": 736,\r
-        "z": "f351885d.7dcd3",\r
+        "x": 2476,\r
+        "y": 724,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "91c41639.2357b",\r
-                "5aa31f25.4b2718"\r
+                "fc6dfa43.dee44",\r
+                "90381d7.56caa6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5aa31f25.4b2718",\r
+        "id": "90381d7.56caa6",\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
+        "x": 2883,\r
+        "y": 742,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "49ef7599.6e682c"\r
+                "d486bdc8.981f98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91c41639.2357b",\r
+        "id": "fc6dfa43.dee44",\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
+        "x": 2883,\r
+        "y": 687,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "c7ffb45b.775578"\r
+                "7563c99.56d39b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7ffb45b.775578",\r
+        "id": "7563c99.56d39b8",\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
+        "x": 3039,\r
+        "y": 685,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              [\r
-                "55624da8.df976c",\r
-                "aecb0c53.70b3e8"\r
+                "dcf1d309.aad128",\r
+                "61cd75bc.541bfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "49ef7599.6e682c",\r
+        "id": "d486bdc8.981f98",\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
+        "x": 3016,\r
+        "y": 743,\r
+        "z": "4996e636.3ea08",\r
          "wires": [\r
              []\r
          ]\r