- Support for the Transport Slicing use-case to work with the updated YANG models

[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 5681c26..79f7746 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": "c170e1ed.7b781",\r
+        "id": "8976bcf1.70ac48",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 137,\r
-        "y": 82,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 233.75,\r
+        "y": 126.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9970ac63.cab4e"\r
+                "b1b89c9d.983348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9970ac63.cab4e",\r
+        "id": "b1b89c9d.983348",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,2248 +22,2358 @@
          "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": 268.2856903076172,\r
-        "y": 131.23810863494873,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 365.0356903076172,\r
+        "y": 175.98810863494873,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d984e08f.709ec8"\r
+                "b0c84a88.7eefc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d984e08f.709ec8",\r
+        "id": "b0c84a88.7eefc",\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": 271.4286193847656,\r
-        "y": 216.00003242492676,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 368.1786193847656,\r
+        "y": 260.75003242492676,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8e4db78f.c5ff38"\r
+                "d31d270a.ac188"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e4db78f.c5ff38",\r
+        "id": "d31d270a.ac188",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 421.238037109375,\r
-        "y": 345.6666564941406,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 517.988037109375,\r
+        "y": 390.4166564941406,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "6bde1442.84f93c",\r
-                "d81cbe5a.85cea",\r
-                "2a368168.cab60e"\r
+                "67b5a6fb.99f89",\r
+                "31666720.2f23b8",\r
+                "1b5adc13.083b6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bde1442.84f93c",\r
+        "id": "67b5a6fb.99f89",\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": 689.5716552734375,\r
-        "y": 732.59716796875,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 786.3216552734375,\r
+        "y": 777.34716796875,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "233d87e5.a24f7",\r
+        "id": "1bac3f01.eca921",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 721,\r
-        "y": 407,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 817.75,\r
+        "y": 451.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d81cbe5a.85cea",\r
+        "id": "31666720.2f23b8",\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": 741,\r
-        "y": 503,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 837.75,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b0036e6b.1878c8",\r
-                "7901c2f.e699b3c",\r
-                "120c06e4.dff209"\r
+                "963616f2.8f1aa8",\r
+                "d3eed549.904728",\r
+                "b7b5ac0a.4b96c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b0036e6b.1878c8",\r
+        "id": "963616f2.8f1aa8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 960,\r
-        "y": 441,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1056.75,\r
+        "y": 485.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9167ffc3.5d91a"\r
+                "85a98f1d.b180e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7901c2f.e699b3c",\r
+        "id": "d3eed549.904728",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 969.490966796875,\r
-        "y": 483.57403564453125,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1066.240966796875,\r
+        "y": 528.3240356445312,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "fe34f5d.3d31308"\r
+                "bfe60f89.4e364"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "120c06e4.dff209",\r
+        "id": "b7b5ac0a.4b96c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 958,\r
-        "y": 530,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1054.75,\r
+        "y": 574.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "6d39868f.7f25c8"\r
+                "2df6c7e.346a038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe34f5d.3d31308",\r
+        "id": "bfe60f89.4e364",\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": 1123.0623779296875,\r
-        "y": 486.8597717285156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1219.8123779296875,\r
+        "y": 531.6097717285156,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d39868f.7f25c8",\r
+        "id": "2df6c7e.346a038",\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": 1127,\r
-        "y": 531,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1223.75,\r
+        "y": 575.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9167ffc3.5d91a",\r
+        "id": "85a98f1d.b180e",\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": 1157,\r
-        "y": 437,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1253.75,\r
+        "y": 481.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5c1ddd56.ddffa4"\r
+                "58591981.123b78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c1ddd56.ddffa4",\r
+        "id": "58591981.123b78",\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": 1380.33349609375,\r
-        "y": 436.99993896484375,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1477.08349609375,\r
+        "y": 481.74993896484375,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "aeacbf90.6ab9e"\r
+                "56e0d242.b4b17c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aeacbf90.6ab9e",\r
+        "id": "56e0d242.b4b17c",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1581.0001335144043,\r
-        "y": 438.00002098083496,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1677.7501335144043,\r
+        "y": 482.75002098083496,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "7ea091c4.73eb6"\r
+                "463ca820.11cf78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd4d27b6.bd205",\r
+        "id": "bda858bd.a9d128",\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": 4400,\r
-        "y": 154,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4496.75,\r
+        "y": 198.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7648091a.a03898",\r
+        "id": "be3c5cce.b55c98",\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": 4481,\r
-        "y": 469,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4577.75,\r
+        "y": 513.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9edc273d.67b87",\r
-                "9c60eb24.47f378"\r
+                "a29e7e17.b5f91",\r
+                "3da90d10.f4de92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9edc273d.67b87",\r
+        "id": "a29e7e17.b5f91",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4790.5,\r
-        "y": 438,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4887.25,\r
+        "y": 482.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9905c30a.05be"\r
+                "878c441e.87326"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c60eb24.47f378",\r
+        "id": "3da90d10.f4de92",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4795.5,\r
-        "y": 503,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4892.25,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8e92f9d2.75f4a8"\r
+                "d4311e2b.569f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9905c30a.05be",\r
+        "id": "878c441e.87326",\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": 4966.5,\r
-        "y": 438,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5063.25,\r
+        "y": 482.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e92f9d2.75f4a8",\r
+        "id": "d4311e2b.569f08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4962,\r
-        "y": 503,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5058.75,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7974f996.7603f8",\r
+        "id": "3e803655.1b101a",\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": 4347.5,\r
-        "y": 657,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4444.25,\r
+        "y": 701.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1460b865.7cff48",\r
+        "id": "4c6ccd14.a8a574",\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": 4501.5,\r
-        "y": 705,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4598.25,\r
+        "y": 749.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d6a6995b.244f78",\r
-                "3058a60d.1382f2"\r
+                "276414cf.b4df2c",\r
+                "64503714.72c7f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6a6995b.244f78",\r
+        "id": "276414cf.b4df2c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4847,\r
-        "y": 686,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4943.75,\r
+        "y": 730.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9008a0fb.361338"\r
+                "102e191c.056cc7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3058a60d.1382f2",\r
+        "id": "64503714.72c7f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4851,\r
-        "y": 726,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4947.75,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5c04d202.902b9c"\r
+                "24862939.f8dc8e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9008a0fb.361338",\r
+        "id": "102e191c.056cc7",\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": 5005,\r
-        "y": 686,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5101.75,\r
+        "y": 730.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5c04d202.902b9c",\r
+        "id": "24862939.f8dc8e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5008.5,\r
-        "y": 726,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5105.25,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "ec17d55b.a0804",\r
-                "144849a3.b4133e"\r
+                "21b9b574.b5d392",\r
+                "9fb31567.2a4df8",\r
+                "88154427.646e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "471d2a77.3a42ac",\r
+        "id": "a1a69def.dde488",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 4345,\r
-        "y": 613,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4441.75,\r
+        "y": 657.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ec17d55b.a0804",\r
+        "id": "21b9b574.b5d392",\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": 5339,\r
-        "y": 691,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5435.75,\r
+        "y": 735.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4e9eb117.9357d",\r
+        "id": "88c6cc39.d0a418",\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": 5203,\r
-        "y": 650,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5299.75,\r
+        "y": 694.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "144849a3.b4133e",\r
+        "id": "9fb31567.2a4df8",\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": 5266,\r
-        "y": 737,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5362.75,\r
+        "y": 781.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4f40e2d1.4262ec",\r
+        "id": "3c21bf12.e3cf58",\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": 4338,\r
-        "y": 202,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4434.75,\r
+        "y": 246.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8abcb98.e721cc8",\r
+        "id": "70ce80db.d98e2",\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": 4364,\r
-        "y": 319,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4460.75,\r
+        "y": 363.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "3115ae28.00936a",\r
-                "34440f82.2778b8",\r
-                "5e322ae1.288484"\r
+                "cd855b12.4c7648",\r
+                "e908220c.f2eba8",\r
+                "9142c53.c51d0b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3115ae28.00936a",\r
+        "id": "cd855b12.4c7648",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4559.5001220703125,\r
-        "y": 271,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4656.2501220703125,\r
+        "y": 315.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5640c3a4.e53454"\r
+                "a4edf485.1b87b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34440f82.2778b8",\r
+        "id": "e908220c.f2eba8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4551.5001220703125,\r
-        "y": 326,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4648.2501220703125,\r
+        "y": 370.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b5a71ca6.0ed8a"\r
+                "9b453a42.4c355"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5640c3a4.e53454",\r
+        "id": "a4edf485.1b87b",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4703.8824462890625,\r
-        "y": 270.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4800.6324462890625,\r
+        "y": 315.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "4125afdc.dc7c38"\r
+                "5c080425.067b9c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2a3abe6.94632",\r
+        "id": "c0826996.0b6fb8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5286,\r
-        "y": 273,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5382.75,\r
+        "y": 317.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "e7a85e47.2ddf5"\r
+                "2f8dc255.fe7e1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4125afdc.dc7c38",\r
+        "id": "5c080425.067b9c",\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": 4888,\r
-        "y": 269,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4984.75,\r
+        "y": 313.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "7289fd85.50ab7c"\r
+                "495e68aa.ac002"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7289fd85.50ab7c",\r
+        "id": "495e68aa.ac002",\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": 5083,\r
-        "y": 269,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5179.75,\r
+        "y": 313.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "e2a3abe6.94632"\r
+                "c0826996.0b6fb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e322ae1.288484",\r
+        "id": "9142c53.c51d0b8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4556.5001220703125,\r
-        "y": 383,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4653.2501220703125,\r
+        "y": 427.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "a5591b6a.a340a8"\r
+                "9ce4b617.939088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5591b6a.a340a8",\r
+        "id": "9ce4b617.939088",\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": 4708.5001220703125,\r
-        "y": 384,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4805.2501220703125,\r
+        "y": 428.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5a71ca6.0ed8a",\r
+        "id": "9b453a42.4c355",\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": 4719.5001220703125,\r
-        "y": 327,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4816.2501220703125,\r
+        "y": 371.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ca9f1df7.d822c",\r
+        "id": "e93c75e1.80ec18",\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": 5671,\r
-        "y": 286,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5767.75,\r
+        "y": 330.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d6fa81cb.78d2d",\r
-                "bcf1b063.c95248",\r
-                "109a3661.2bbbd2"\r
+                "31d08ad5.ae1df6",\r
+                "38f9754c.f69992",\r
+                "31e3f0ee.1be648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7a85e47.2ddf5",\r
+        "id": "2f8dc255.fe7e1e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5465,\r
-        "y": 273,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5561.75,\r
+        "y": 317.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "211b93a9.ce5f0c",\r
-                "ca9f1df7.d822c"\r
+                "35fe1089.09d838",\r
+                "e93c75e1.80ec18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "211b93a9.ce5f0c",\r
+        "id": "35fe1089.09d838",\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": 5701,\r
-        "y": 234,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5797.75,\r
+        "y": 278.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6fa81cb.78d2d",\r
+        "id": "31d08ad5.ae1df6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5881,\r
-        "y": 277,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5977.75,\r
+        "y": 321.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "bf2e4f3b.81ed8"\r
+                "dcbf70b.fe9e51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcf1b063.c95248",\r
+        "id": "38f9754c.f69992",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5873,\r
-        "y": 332,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5969.75,\r
+        "y": 376.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "bfa4b512.849248"\r
+                "b70d6ea.910679"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "109a3661.2bbbd2",\r
+        "id": "31e3f0ee.1be648",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5878,\r
-        "y": 389,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5974.75,\r
+        "y": 433.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "76f805.e622cffc"\r
+                "96cd1d2a.b041a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76f805.e622cffc",\r
+        "id": "96cd1d2a.b041a",\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": 6030,\r
-        "y": 390,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6126.75,\r
+        "y": 434.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bfa4b512.849248",\r
+        "id": "b70d6ea.910679",\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": 6041,\r
-        "y": 335,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6137.75,\r
+        "y": 379.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bf2e4f3b.81ed8",\r
+        "id": "dcbf70b.fe9e51",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6025.38232421875,\r
-        "y": 274.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6122.13232421875,\r
+        "y": 319.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "76b40334.8bd094"\r
+                "b0be4e8c.83ee08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76b40334.8bd094",\r
+        "id": "b0be4e8c.83ee08",\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": 6240,\r
-        "y": 271,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6336.75,\r
+        "y": 315.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a368168.cab60e",\r
+        "id": "1b5adc13.083b6c",\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": 707,\r
-        "y": 451,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 803.75,\r
+        "y": 495.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3bea0429.f0ebac",\r
+        "id": "321a405b.7459b8",\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": 3807,\r
-        "y": 1611,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3903.75,\r
+        "y": 1655.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d501f859.eecd18",\r
+        "id": "13cb6aa6.78d01d",\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": 3870,\r
-        "y": 1940,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3966.75,\r
+        "y": 1984.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8a516999.f983f8",\r
-                "e1e3477c.cb45b"\r
+                "10d81799.8466e",\r
+                "67bbae69.f0649"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a516999.f983f8",\r
+        "id": "10d81799.8466e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4165.5,\r
-        "y": 1907,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4262.25,\r
+        "y": 1951.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "1f32cbd.2007fb4"\r
+                "892eb025.ee91a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e1e3477c.cb45b",\r
+        "id": "67bbae69.f0649",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4170.5,\r
-        "y": 1972,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4267.25,\r
+        "y": 2016.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5be15aea.63aa2c"\r
+                "f603d29b.ff0438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f32cbd.2007fb4",\r
+        "id": "892eb025.ee91a8",\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": 4333.5,\r
-        "y": 1907,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4430.25,\r
+        "y": 1951.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5be15aea.63aa2c",\r
+        "id": "f603d29b.ff0438",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4344,\r
-        "y": 1972,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4440.75,\r
+        "y": 2016.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "32f45e6c.4d0bea",\r
+        "id": "88f53e94.6d0a1",\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": 3746,\r
-        "y": 1668,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3842.75,\r
+        "y": 1712.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8ca7925.e0f8c",\r
+        "id": "3fa49f7e.accef8",\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": 3766,\r
-        "y": 1765,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3862.75,\r
+        "y": 1809.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9bb092a5.d05b48",\r
-                "221dd2f3.9ac236",\r
-                "26d51b0f.5d004c"\r
+                "ebf12595.10e938",\r
+                "efabfdfe.5ba96",\r
+                "205446da.fa0a6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9bb092a5.d05b48",\r
+        "id": "ebf12595.10e938",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3968.5001220703125,\r
-        "y": 1718,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4065.2501220703125,\r
+        "y": 1762.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b690bac2.55724"\r
+                "3bb96014.a51678"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "221dd2f3.9ac236",\r
+        "id": "efabfdfe.5ba96",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3960.5001220703125,\r
-        "y": 1773,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4057.2501220703125,\r
+        "y": 1817.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b19648bb.51984"\r
+                "6194e30c.a75eac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b690bac2.55724",\r
+        "id": "3bb96014.a51678",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4112.8824462890625,\r
-        "y": 1715.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4209.6324462890625,\r
+        "y": 1760.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "bc889fde.13a798"\r
+                "60e39d5f.e73f74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc889fde.13a798",\r
+        "id": "60e39d5f.e73f74",\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": 4297,\r
-        "y": 1730,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4393.75,\r
+        "y": 1774.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "6cdbe20d.6924d4"\r
+                "f8535a31.25ce18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26d51b0f.5d004c",\r
+        "id": "205446da.fa0a6a",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3965.5001220703125,\r
-        "y": 1830,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4062.2501220703125,\r
+        "y": 1874.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5f4cb2c4.11fb94"\r
+                "126fd357.b0d735"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f4cb2c4.11fb94",\r
+        "id": "126fd357.b0d735",\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": 4117.5001220703125,\r
-        "y": 1831,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4214.2501220703125,\r
+        "y": 1875.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b19648bb.51984",\r
+        "id": "6194e30c.a75eac",\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": 4128.5001220703125,\r
-        "y": 1776,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4225.2501220703125,\r
+        "y": 1820.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73a1b393.2e09c4",\r
+        "id": "a4686eb2.3a15b8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4695,\r
-        "y": 1734,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4791.75,\r
+        "y": 1778.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "ab9ee354.2292b"\r
+                "dd82991b.5dd978"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6cdbe20d.6924d4",\r
+        "id": "f8535a31.25ce18",\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": 4492,\r
-        "y": 1730,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4588.75,\r
+        "y": 1774.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "73a1b393.2e09c4"\r
+                "a4686eb2.3a15b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f5d9d19.39869b",\r
+        "id": "ad6998e4.c7769",\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": 5080,\r
-        "y": 1733,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5176.75,\r
+        "y": 1777.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "9355225.5c1536",\r
-                "66c76394.d1fea4",\r
-                "2e8b8501.9ee95a"\r
+                "f50cc222.33dcd",\r
+                "8488316b.70cb5",\r
+                "804e8e55.127ce"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab9ee354.2292b",\r
+        "id": "dd82991b.5dd978",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4872,\r
-        "y": 1726,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4968.75,\r
+        "y": 1770.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "28e5278d.3f4238",\r
-                "1f5d9d19.39869b"\r
+                "c219345a.333ee8",\r
+                "ad6998e4.c7769"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28e5278d.3f4238",\r
+        "id": "c219345a.333ee8",\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": 5110,\r
-        "y": 1681,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5206.75,\r
+        "y": 1725.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8616ea00.2e5968",\r
+        "id": "5afc9335.91bec4",\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": 5439,\r
-        "y": 1837,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5535.75,\r
+        "y": 1881.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ef11dae.da91",\r
+        "id": "bba1d37e.3ac768",\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": 5450,\r
-        "y": 1782,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5546.75,\r
+        "y": 1826.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d4ab39c.829a8c8",\r
+        "id": "4872e24d.b18cd4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5434.38232421875,\r
-        "y": 1721.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5531.13232421875,\r
+        "y": 1766.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "4d0c934c.0c9114"\r
+                "4b7568ba.14d37"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d0c934c.0c9114",\r
+        "id": "4b7568ba.14d37",\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": 5649,\r
-        "y": 1718,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5745.75,\r
+        "y": 1762.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9355225.5c1536",\r
+        "id": "f50cc222.33dcd",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5290,\r
-        "y": 1724,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5386.75,\r
+        "y": 1768.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d4ab39c.829a8c8"\r
+                "4872e24d.b18cd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "66c76394.d1fea4",\r
+        "id": "8488316b.70cb5",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5282,\r
-        "y": 1779,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5378.75,\r
+        "y": 1823.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8ef11dae.da91"\r
+                "bba1d37e.3ac768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e8b8501.9ee95a",\r
+        "id": "804e8e55.127ce",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5287,\r
-        "y": 1836,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5383.75,\r
+        "y": 1880.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8616ea00.2e5968"\r
+                "5afc9335.91bec4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ea091c4.73eb6",\r
+        "id": "463ca820.11cf78",\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": 1819,\r
-        "y": 440,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 1915.75,\r
+        "y": 484.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "cf96a339.12fc08",\r
-                "ebf1abf2.c0a2b8",\r
-                "a6813928.711c6"\r
+                "2eb4dc08.7f1c34",\r
+                "fa210005.600e9",\r
+                "cf2c914d.6b904"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf96a339.12fc08",\r
+        "id": "2eb4dc08.7f1c34",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2027,\r
-        "y": 404,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2123.75,\r
+        "y": 448.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "7e9b774d.9e8c28"\r
+                "fdf5ae6d.1a01"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf1abf2.c0a2b8",\r
+        "id": "fa210005.600e9",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2027.490966796875,\r
-        "y": 449.57403564453125,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2124.240966796875,\r
+        "y": 494.32403564453125,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b2e1099a.08fc3"\r
+                "f1f7e3b1.bd8ea8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6813928.711c6",\r
+        "id": "cf2c914d.6b904",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2025,\r
-        "y": 493,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2121.75,\r
+        "y": 537.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "8f5ccf37.c152"\r
+                "da54cf61.ae1b78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2e1099a.08fc3",\r
+        "id": "f1f7e3b1.bd8ea8",\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": 2190.0623779296875,\r
-        "y": 449.8597717285156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2286.8123779296875,\r
+        "y": 494.6097717285156,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f5ccf37.c152",\r
+        "id": "da54cf61.ae1b78",\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": 2194,\r
-        "y": 494,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2290.75,\r
+        "y": 538.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2f04c146.0a3af6",\r
+        "id": "7cc4f06d.7fdaa",\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": 2500,\r
-        "y": 493,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2596.75,\r
+        "y": 537.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "675654a6.d7ff34",\r
-                "15ae8ffb.52d9c8",\r
-                "5de62fdc.3f5a78"\r
+                "48c45912.635ab8",\r
+                "a55b1245.6d5a98",\r
+                "5114317.7fef9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c4252359.e0b548",\r
+        "id": "f222a91f.adc5a8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2884,\r
-        "y": 493,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2976.75,\r
+        "y": 625.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "cf117e36.f49698",\r
-                "9e15ad66.cb5638"\r
+                "941633f0.a03e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "675654a6.d7ff34",\r
+        "id": "48c45912.635ab8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2711,\r
-        "y": 495,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2807.75,\r
+        "y": 626.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "c4252359.e0b548"\r
+                "f222a91f.adc5a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15ae8ffb.52d9c8",\r
+        "id": "a55b1245.6d5a98",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2711.490966796875,\r
-        "y": 540.5740356445312,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2810.240966796875,\r
+        "y": 522.3240356445312,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "1c0c1f66.646011"\r
+                "c2aa70b6.4baf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5de62fdc.3f5a78",\r
+        "id": "5114317.7fef9d",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2709,\r
-        "y": 584,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2805.75,\r
+        "y": 566.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "96b5913.ff6507"\r
+                "3cb9370e.446c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96b5913.ff6507",\r
+        "id": "3cb9370e.446c48",\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": 2876,\r
-        "y": 583,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2973.75,\r
+        "y": 566.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c0c1f66.646011",\r
+        "id": "c2aa70b6.4baf8",\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": 2874.0623779296875,\r
-        "y": 540.8597717285156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2972.8125,\r
+        "y": 521.6097412109375,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e9b774d.9e8c28",\r
+        "id": "fdf5ae6d.1a01",\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": 2228,\r
-        "y": 399,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2324.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "a33b5641.550dd8"\r
+                "de0f0110.005fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a33b5641.550dd8",\r
+        "id": "de0f0110.005fa8",\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": 2433,\r
-        "y": 399,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2529.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "dcc9c2f.bdc72c"\r
+                "a755493f.53e5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcc9c2f.bdc72c",\r
+        "id": "a755493f.53e5c",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2599,\r
-        "y": 399,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2695.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b86471e.744979"\r
+                "30deb2e6.ddbdde"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b86471e.744979",\r
+        "id": "30deb2e6.ddbdde",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2762,\r
-        "y": 399,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 2858.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "2f04c146.0a3af6",\r
-                "65e4f8bf.6cf8f"\r
+                "7cc4f06d.7fdaa",\r
+                "5a3b76e5.927ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf117e36.f49698",\r
+        "id": "e892b304.06846",\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": 3138,\r
-        "y": 492,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3417.75,\r
+        "y": 726.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "965ac3c2.a1d608",\r
-                "6bf420f8.6129c8"\r
+                "21602510.29ed62",\r
+                "bcc4ade6.f232"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "965ac3c2.a1d608",\r
+        "id": "21602510.29ed62",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3391,\r
-        "y": 526,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3631.75,\r
+        "y": 763.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "f82e8947.2d7ce8"\r
+                "134315e7.fd7042"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bf420f8.6129c8",\r
+        "id": "bcc4ade6.f232",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3391,\r
-        "y": 470,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3633.75,\r
+        "y": 701.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "aacf39c3.b541a"\r
+                "3ace6707.d27cb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f82e8947.2d7ce8",\r
+        "id": "134315e7.fd7042",\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": 3115,\r
-        "y": 1962,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3211.75,\r
+        "y": 2006.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "10da65e0.f509ca",\r
-                "73ba091f.6ce2a"\r
+                "36f11901.c669fe",\r
+                "3d3a4221.98f866"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10da65e0.f509ca",\r
+        "id": "36f11901.c669fe",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3368,\r
-        "y": 1996,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3464.75,\r
+        "y": 2040.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d3f311e2.47dc9"\r
+                "861f9ff3.a542f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "73ba091f.6ce2a",\r
+        "id": "3d3a4221.98f866",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3368,\r
-        "y": 1940,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3464.75,\r
+        "y": 1984.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "4a6141b6.6b0c98"\r
+                "cd34c51c.32ff6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d3f311e2.47dc9",\r
+        "id": "861f9ff3.a542f8",\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": 3519,\r
-        "y": 1996,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3615.75,\r
+        "y": 2040.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fb92b32f.578d9",\r
+        "id": "37ab634e.8eb82c",\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": 4395,\r
-        "y": 94,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4491.75,\r
+        "y": 138.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "16b6eb5a.c037cd",\r
+        "id": "e9288827.8d4e48",\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": 3803,\r
-        "y": 1553,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3899.75,\r
+        "y": 1597.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5fbea6d.693118",\r
+        "id": "5833352c.36b4cc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4086,\r
-        "y": 351,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4182.75,\r
+        "y": 395.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "fb92b32f.578d9",\r
-                "fd4d27b6.bd205",\r
-                "4f40e2d1.4262ec",\r
-                "8abcb98.e721cc8",\r
-                "7974f996.7603f8",\r
-                "1460b865.7cff48",\r
-                "7648091a.a03898"\r
+                "37ab634e.8eb82c",\r
+                "bda858bd.a9d128",\r
+                "3c21bf12.e3cf58",\r
+                "70ce80db.d98e2",\r
+                "3e803655.1b101a",\r
+                "4c6ccd14.a8a574",\r
+                "be3c5cce.b55c98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a6141b6.6b0c98",\r
+        "id": "cd34c51c.32ff6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3519,\r
-        "y": 1939,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3615.75,\r
+        "y": 1983.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "16b6eb5a.c037cd",\r
-                "3bea0429.f0ebac",\r
-                "32f45e6c.4d0bea",\r
-                "e8ca7925.e0f8c",\r
-                "d501f859.eecd18",\r
-                "dfc89384.6f3b98",\r
-                "7e08fa79.0c018c"\r
+                "e9288827.8d4e48",\r
+                "321a405b.7459b8",\r
+                "88f53e94.6d0a1",\r
+                "3fa49f7e.accef8",\r
+                "13cb6aa6.78d01d",\r
+                "6887177c.ca96",\r
+                "4e3c7c24.641514"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfc89384.6f3b98",\r
+        "id": "6887177c.ca96",\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": 3748,\r
-        "y": 2082,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3844.75,\r
+        "y": 2126.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e08fa79.0c018c",\r
+        "id": "4e3c7c24.641514",\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": 3902,\r
-        "y": 2130,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3998.75,\r
+        "y": 2174.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "dd71fa1b.6e05f",\r
-                "23079c35.06b53c"\r
+                "a995cca0.79095",\r
+                "691eaa5b.460a8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd71fa1b.6e05f",\r
+        "id": "a995cca0.79095",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4247.5,\r
-        "y": 2111,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4344.25,\r
+        "y": 2155.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "531e9904.6c0cf"\r
+                "8dda8416.3500c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23079c35.06b53c",\r
+        "id": "691eaa5b.460a8c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4251.5,\r
-        "y": 2151,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4348.25,\r
+        "y": 2195.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "ca751a91.a1fc5"\r
+                "12034c01.7a6e24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "531e9904.6c0cf",\r
+        "id": "8dda8416.3500c",\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": 4405.5,\r
-        "y": 2111,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4502.25,\r
+        "y": 2155.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ca751a91.a1fc5",\r
+        "id": "12034c01.7a6e24",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4409,\r
-        "y": 2151,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4505.75,\r
+        "y": 2195.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "acce8a06.32f9",\r
-                "300cb80e.add27"\r
+                "7af02db5.1d648c",\r
+                "7e35a72c.c5049",\r
+                "ed48bc59.3a7d1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed3d8ab7.5da83",\r
+        "id": "8f84b99e.0eac8",\r
          "type": "comment",\r
          "name": "TODO: FIXME:",\r
          "info": "put proper values based on connectivity resource retrieved from AAI",\r
          "comments": "",\r
-        "x": 3745.5,\r
-        "y": 2038,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3842.25,\r
+        "y": 2082.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "acce8a06.32f9",\r
+        "id": "7af02db5.1d648c",\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": 4749,\r
-        "y": 2150,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4845.75,\r
+        "y": 2194.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dd0732a8.6dcd38",\r
+        "id": "1abb03b6.c2733c",\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": 4607,\r
-        "y": 2108,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4703.75,\r
+        "y": 2152.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "300cb80e.add27",\r
+        "id": "7e35a72c.c5049",\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": 4678,\r
-        "y": 2199,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4774.75,\r
+        "y": 2243.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9e15ad66.cb5638",\r
+        "id": "7f9728ff.5a56d",\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": 3125,\r
-        "y": 398,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3408.75,\r
+        "y": 666.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "65e4f8bf.6cf8f",\r
+        "id": "5a3b76e5.927ca8",\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": 2946,\r
-        "y": 270,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3042.75,\r
+        "y": 314.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "198fcdf8.1e22c2",\r
+        "id": "5dc7fe07.3de0e",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3907,\r
-        "y": 308,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4003.75,\r
+        "y": 352.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ca0cd7a2.5ca728",\r
+        "id": "95f7053c.6e7e8",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3464,\r
-        "y": 1886,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3560.75,\r
+        "y": 1930.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aacf39c3.b541a",\r
+        "id": "3ace6707.d27cb8",\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": 3615,\r
-        "y": 468,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3739.75,\r
+        "y": 514.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "df2281b1.f49f38",\r
-                "aea11bc2.879238"\r
+                "784800ed.f5bf68",\r
+                "38254c71.c979d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aea11bc2.879238",\r
+        "id": "38254c71.c979d4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3885,\r
-        "y": 1059,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3981.75,\r
+        "y": 1103.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "f4291584.31d5f8"\r
+                "8cda2b7.f98f558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "df2281b1.f49f38",\r
+        "id": "784800ed.f5bf68",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3879,\r
-        "y": 350,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 3975.75,\r
+        "y": 394.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b5fbea6d.693118"\r
+                "5833352c.36b4cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4291584.31d5f8",\r
+        "id": "8cda2b7.f98f558",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4043,\r
-        "y": 1058,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4139.75,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "507acb8a.026844",\r
-                "328f5ebe.d2c3f2",\r
-                "282b55f0.c4b452",\r
-                "f1d5dfc2.902f38",\r
-                "e32fad74.744d"\r
+                "b7c2373e.9cd388",\r
+                "147ed25c.bf0c96",\r
+                "9a1eac1c.da1de8",\r
+                "2922d6af.6c9642",\r
+                "6061bd4e.a66dac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "328f5ebe.d2c3f2",\r
+        "id": "147ed25c.bf0c96",\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": 4307,\r
-        "y": 941,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4403.75,\r
+        "y": 985.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e32fad74.744d",\r
+        "id": "6061bd4e.a66dac",\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": 4388,\r
-        "y": 1256,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4484.75,\r
+        "y": 1300.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "4fa7d7bd.5a2ab",\r
-                "f472be3.5d0074"\r
+                "de634d2d.e7705",\r
+                "961ea997.f45bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4fa7d7bd.5a2ab",\r
+        "id": "de634d2d.e7705",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4697.5,\r
-        "y": 1225,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4794.25,\r
+        "y": 1269.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "1f127e35.6d237a"\r
+                "4e3f5895.525ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f472be3.5d0074",\r
+        "id": "961ea997.f45bc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4702.5,\r
-        "y": 1290,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4799.25,\r
+        "y": 1334.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "5d6567d4.56edf"\r
+                "8c3ef243.d5f688"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f127e35.6d237a",\r
+        "id": "4e3f5895.525ca8",\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": 4873.5,\r
-        "y": 1225,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4970.25,\r
+        "y": 1269.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d6567d4.56edf",\r
+        "id": "8c3ef243.d5f688",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4869,\r
-        "y": 1290,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4965.75,\r
+        "y": 1334.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "282b55f0.c4b452",\r
+        "id": "9a1eac1c.da1de8",\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": 4245,\r
-        "y": 989,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4341.75,\r
+        "y": 1033.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1d5dfc2.902f38",\r
+        "id": "2922d6af.6c9642",\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": 4271,\r
-        "y": 1106,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4367.75,\r
+        "y": 1150.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "b1abc6d5.732f1",\r
-                "5f6c0c85.ca44ac",\r
-                "386d37a9.f48098"\r
+                "7da6d8ec.042ad",\r
+                "feb3e7e4.820368",\r
+                "c44e5f71.e84558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1abc6d5.732f1",\r
+        "id": "7da6d8ec.042ad",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4466.5001220703125,\r
-        "y": 1058,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4563.2501220703125,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "7b990f0b.20c288"\r
+                "e38aeca.3dbc21"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f6c0c85.ca44ac",\r
+        "id": "feb3e7e4.820368",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4458.5001220703125,\r
-        "y": 1113,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4555.2501220703125,\r
+        "y": 1157.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "315f8841.f40a1"\r
+                "7637358b.a7e4fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7b990f0b.20c288",\r
+        "id": "e38aeca.3dbc21",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4610.8824462890625,\r
-        "y": 1057.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4707.6324462890625,\r
+        "y": 1102.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "c8fb728b.2dc648"\r
+                "fc132576.25bf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8fb728b.2dc648",\r
+        "id": "fc132576.25bf4",\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": 4795,\r
-        "y": 1056,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4891.75,\r
+        "y": 1100.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "d59f0b39.d31cc8"\r
+                "823913cb.fbad5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d59f0b39.d31cc8",\r
+        "id": "823913cb.fbad5",\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": 4990,\r
-        "y": 1056,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5086.75,\r
+        "y": 1100.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "7e05c38e.6d5cbc"\r
+                "ac47c77.0d50538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "386d37a9.f48098",\r
+        "id": "c44e5f71.e84558",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4463.5001220703125,\r
-        "y": 1170,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4560.2501220703125,\r
+        "y": 1214.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "46492ab4.cb6c04"\r
+                "e748e54c.7c4d78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "46492ab4.cb6c04",\r
+        "id": "e748e54c.7c4d78",\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": 4615.5001220703125,\r
-        "y": 1171,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4712.2501220703125,\r
+        "y": 1215.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "315f8841.f40a1",\r
+        "id": "7637358b.a7e4fc",\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": 4626.5001220703125,\r
-        "y": 1114,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4723.2501220703125,\r
+        "y": 1158.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "507acb8a.026844",\r
+        "id": "b7c2373e.9cd388",\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": 4302,\r
-        "y": 881,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4398.75,\r
+        "y": 925.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e05c38e.6d5cbc",\r
+        "id": "ac47c77.0d50538",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5193,\r
-        "y": 1060,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5289.75,\r
+        "y": 1104.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "436389a3.57fb78"\r
+                "ee4f92a0.59618"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a766cec.04fc1c",\r
+        "id": "afac86b6.9de7f8",\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": 5578,\r
-        "y": 1073,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5674.75,\r
+        "y": 1117.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "985e5e77.801e6",\r
-                "a10da0b1.afaa18",\r
-                "4e466bf1.fc05c4"\r
+                "25aa1b1d.6db59c",\r
+                "a1092777.856c6",\r
+                "2b2036c0.eb7f62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "436389a3.57fb78",\r
+        "id": "ee4f92a0.59618",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5372,\r
-        "y": 1060,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5468.75,\r
+        "y": 1104.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "507f9c6b.ef2c2c",\r
-                "6a766cec.04fc1c"\r
+                "e370a3c1.84639",\r
+                "afac86b6.9de7f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "507f9c6b.ef2c2c",\r
+        "id": "e370a3c1.84639",\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": 5608,\r
-        "y": 1021,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5704.75,\r
+        "y": 1065.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "985e5e77.801e6",\r
+        "id": "25aa1b1d.6db59c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5788,\r
-        "y": 1064,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5884.75,\r
+        "y": 1108.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "37e160ea.8f86d8"\r
+                "345ab0d6.763128"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a10da0b1.afaa18",\r
+        "id": "a1092777.856c6",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5780,\r
-        "y": 1119,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5876.75,\r
+        "y": 1163.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "81ccddb5.3e1b1"\r
+                "42378f39.6fe7f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4e466bf1.fc05c4",\r
+        "id": "2b2036c0.eb7f62",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5785,\r
-        "y": 1176,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 5881.75,\r
+        "y": 1220.75,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "c4f4a10b.e46a6"\r
+                "cd65837d.e470e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c4f4a10b.e46a6",\r
+        "id": "cd65837d.e470e",\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": 5937,\r
-        "y": 1177,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6033.75,\r
+        "y": 1221.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "81ccddb5.3e1b1",\r
+        "id": "42378f39.6fe7f",\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": 5948,\r
-        "y": 1122,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6044.75,\r
+        "y": 1166.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "37e160ea.8f86d8",\r
+        "id": "345ab0d6.763128",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5932.38232421875,\r
-        "y": 1061.6556701660156,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6029.13232421875,\r
+        "y": 1106.4056701660156,\r
+        "z": "21b8a150.843866",\r
          "wires": [\r
              [\r
-                "4cbb09e8.a29488"\r
+                "50b0a43e.7ed78c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4cbb09e8.a29488",\r
+        "id": "50b0a43e.7ed78c",\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": 6147,\r
-        "y": 1058,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 6243.75,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28d376a3.473102",\r
+        "id": "73d673d.bf12a0c",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3921,\r
-        "y": 999,\r
-        "z": "bc289cb4.31b288",\r
+        "x": 4017.75,\r
+        "y": 1043.75,\r
+        "z": "21b8a150.843866",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "941633f0.a03e2",\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": 2579.75,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            [\r
+                "cee45ed9.f16768",\r
+                "eb58c452.cd625"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eb58c452.cd625",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2986.75,\r
+        "y": 788.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            [\r
+                "736cb25.e089b4c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cee45ed9.f16768",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2986.75,\r
+        "y": 733.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            [\r
+                "ba60006d.870c1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba60006d.870c1",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3142.75,\r
+        "y": 731.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            [\r
+                "7f9728ff.5a56d",\r
+                "e892b304.06846"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "736cb25.e089b4c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3119.75,\r
+        "y": 789.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "88154427.646e5",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5382.5,\r
+        "y": 842.25,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed48bc59.3a7d1",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4794.25,\r
+        "y": 2310,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file