From caa341e05473117ce4269e3fd9809a9494e168a1 Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Mon, 19 Nov 2018 17:56:22 +0530
Subject: ccvpn integration sdnc issue fix

Fixed couple of issues
1. SDWAN connectivity request was failing due
   to empty request body in tenant authorization
   put request.
2. Get token issue fixed for sotn DG's
3. SDWAN Allotted resource relationship with parent
   service instance ID is missing, added it.

Change-Id: Ib6451c93e6a6b7886cd5614d064270ff9182030b
Issue-ID: SDNC-527
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 8bc1837ee0ca323786f0de34ad9bb6d9a755770a
---
 ...sdwan-attachment-topology-operation-create.json | 2625 ++++-----
 ...GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json |  424 +-
 ..._sdwan-network-topology-operation-activate.json | 1694 +++---
 ...otn-attachment-topology-operation-activate.json | 6064 ++++++++++----------
 ...n-attachment-topology-operation-deactivate.json | 4104 ++++++-------
 ..._sdwan-attachment-topology-operation-create.xml |   10 +
 .../GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml |    1 +
 ...I_sdwan-network-topology-operation-activate.xml |    2 +
 ...sotn-attachment-topology-operation-activate.xml |   79 +-
 ...tn-attachment-topology-operation-deactivate.xml |   76 +-
 10 files changed, 7648 insertions(+), 7431 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main')

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index bd279399..8dd29ed3 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
@@ -1,1305 +1,1320 @@
-[
-  {
-    "id": "ad2ef973.e6a378",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 131,
-    "y": 55,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "151183ce.27c78c"
-      ]
-    ]
-  },
-  {
-    "id": "151183ce.27c78c",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "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}'>",
-    "outputs": 1,
-    "x": 314.00000381469727,
-    "y": 129.000018119812,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "89afc74f.956348"
-      ]
-    ]
-  },
-  {
-    "id": "89afc74f.956348",
-    "type": "method",
-    "name": "sdwan-attachment-topology-operation-create",
-    "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 302.0001220703125,
-    "y": 217.00000095367432,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "580de8c5.e06e78"
-      ]
-    ]
-  },
-  {
-    "id": "580de8c5.e06e78",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 222.00005340576172,
-    "y": 966.0002489089966,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "1fbb291d.155017",
-        "f8c6b86f.980db8",
-        "655b6d38.675514",
-        "87b8ca30.cf86e8",
-        "3718c342.00f4ac",
-        "3fc33b48.8d6bf4",
-        "15c0d821.288668",
-        "99b25b64.985da8",
-        "cc1d8a7e.c8e908",
-        "aec371b2.f4eb6",
-        "7c0d6a4c.141ba4",
-        "605ed84a.e90ef8",
-        "cf809c65.e205f",
-        "5ffc39de.e33178",
-        "b70e6d89.61807",
-        "2fe0bf35.0314b",
-        "4b90a515.ea737c",
-        "30825693.105b0a",
-        "a79587b.c624178",
-        "9d0211a4.58ce8",
-        "5c590a79.9e0264",
-        "adeabb6e.cf7758",
-        "7ee858c0.930c58"
-      ]
-    ]
-  },
-  {
-    "id": "74beb7.011b0148",
-    "type": "comment",
-    "name": "Set allotted resource id if not sent by SO",
-    "info": "",
-    "comments": "",
-    "x": 706.0767517089844,
-    "y": 126.43391990661621,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "1fbb291d.155017",
-    "type": "switchNode",
-    "name": "switch allotted-resource-id",
-    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 652.0000305175781,
-    "y": 181.99999332427979,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "4a85a033.b553c",
-        "de2e876a.0ba078"
-      ]
-    ]
-  },
-  {
-    "id": "4a85a033.b553c",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 850.0001182556152,
-    "y": 151.999981880188,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "63eb9d84.765954"
-      ]
-    ]
-  },
-  {
-    "id": "de2e876a.0ba078",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 849.0000267028809,
-    "y": 188.99999237060547,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "eef884cd.26a128"
-      ]
-    ]
-  },
-  {
-    "id": "eef884cd.26a128",
-    "type": "set",
-    "name": "set tmp.ar.allotted-resource-id",
-    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
-    "comments": "",
-    "x": 1047.000015258789,
-    "y": 186.0000114440918,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "f8c6b86f.980db8",
-    "type": "set",
-    "name": "set tmp.ar.self-link",
-    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
-    "comments": "",
-    "x": 619.9999542236328,
-    "y": 403.0001001358032,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "655b6d38.675514",
-    "type": "execute",
-    "name": "execute Properties",
-    "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' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 620.2618713378906,
-    "y": 484.6667814254761,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "87b8ca30.cf86e8",
-    "type": "execute",
-    "name": "generate allotted-resource tmp.ar-url",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 673.2619323730469,
-    "y": 571.6666994094849,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "63eb9d84.765954",
-    "type": "execute",
-    "name": "execute tmp.ar.allotted-resource-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1065.0000953674316,
-    "y": 152.9999876022339,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "7fcc0333.e4b76c"
-      ]
-    ]
-  },
-  {
-    "id": "7fcc0333.e4b76c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1283.0001373291016,
-    "y": 152.99995136260986,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "dc8faa82.0a80d8"
-      ]
-    ]
-  },
-  {
-    "id": "dc8faa82.0a80d8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
-    "comments": "",
-    "x": 1449.0000915527344,
-    "y": 152.9999656677246,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "83948a24.3af768",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1179.0002307891846,
-    "y": 643.7778720855713,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "64a66d0e.2cab24"
-      ]
-    ]
-  },
-  {
-    "id": "fd6c452f.f52a18",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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: Existing connection attachment allotted resource\" />\n    \n",
-    "comments": "",
-    "x": 1912.5186100006104,
-    "y": 644.8439435958862,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "df1c313d.a9cf4",
-    "type": "comment",
-    "name": "Check for non existence of allotted resource",
-    "info": "",
-    "comments": "",
-    "x": 1035.0001525878906,
-    "y": 577.7779388427734,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "3c6b3ac8.5f54b6",
-    "type": "for",
-    "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
-    "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1555.6666984558105,
-    "y": 788.0000512599945,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "e0e0a661.74b9e8"
-      ]
-    ]
-  },
-  {
-    "id": "3fc33b48.8d6bf4",
-    "type": "switchNode",
-    "name": "switch service-data.consumed-allotted-resources_length",
-    "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 737.6660232543945,
-    "y": 764.7140836715698,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "98246edb.9d503",
-        "303d6837.0384d8"
-      ]
-    ]
-  },
-  {
-    "id": "98246edb.9d503",
-    "type": "other",
-    "name": "outcome Null",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1041.8089218139648,
-    "y": 733.5715208053589,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "1bc15eed.fd45b1"
-      ]
-    ]
-  },
-  {
-    "id": "303d6837.0384d8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1018.8089714050293,
-    "y": 794.571475982666,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "b930de42.50a21"
-      ]
-    ]
-  },
-  {
-    "id": "b930de42.50a21",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1178.9360618591309,
-    "y": 792.697452545166,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "3c6b3ac8.5f54b6",
-        "7d532296.0d9bfc",
-        "6dd5cf93.f0258"
-      ]
-    ]
-  },
-  {
-    "id": "1bc15eed.fd45b1",
-    "type": "set",
-    "name": "set cidx",
-    "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
-    "comments": "",
-    "x": 1191.6659049987793,
-    "y": 731.2855710983276,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "15c0d821.288668",
-    "type": "set",
-    "name": "set consumed allotted resources",
-    "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
-    "comments": "",
-    "x": 666.5233154296875,
-    "y": 868.2856483459473,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "7d532296.0d9bfc",
-    "type": "switchNode",
-    "name": "switch tmp.found-cidx",
-    "xml": "<switch test='`$tmp.found-cidx`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1368.0511093139648,
-    "y": 824.708975315094,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "106270aa.e9c6ff"
-      ]
-    ]
-  },
-  {
-    "id": "106270aa.e9c6ff",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1558.0510635375977,
-    "y": 824.7089123725891,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "e1144596.6d5ba8"
-      ]
-    ]
-  },
-  {
-    "id": "e1144596.6d5ba8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1724.0510635375977,
-    "y": 824.7089123725891,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "b93f3869.6459e8"
-      ]
-    ]
-  },
-  {
-    "id": "e0e0a661.74b9e8",
-    "type": "switchNode",
-    "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1972.7783279418945,
-    "y": 785.000078201294,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "326d00a0.76b6c"
-      ]
-    ]
-  },
-  {
-    "id": "326d00a0.76b6c",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2154.587902069092,
-    "y": 785.4645252227783,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "cec76fbc.ec734"
-      ]
-    ]
-  },
-  {
-    "id": "b93f3869.6459e8",
-    "type": "set",
-    "name": "set tmp.cidx",
-    "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
-    "comments": "",
-    "x": 1885.924446105957,
-    "y": 824.2206134796143,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "9dc9afd9.071d8",
-    "type": "comment",
-    "name": "Add to consumed service consumed-allotted-resources in mdsal",
-    "info": "Prepare data and add to service-data",
-    "comments": "",
-    "x": 758.667236328125,
-    "y": 695.0000476837158,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "79d72e28.e5bf",
-    "type": "comment",
-    "name": "This set resource will be added to MDSAL by provider code",
-    "info": "Below we add to service-data.consumed-allotted-resource at last index",
-    "comments": "",
-    "x": 746.0001525878906,
-    "y": 833.7781400680542,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "7ee858c0.930c58",
-    "type": "update",
-    "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 656.6908569335938,
-    "y": 1793.531904220581,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "54e2f563.b3af5c",
-        "291816ed.18393a"
-      ]
-    ]
-  },
-  {
-    "id": "54e2f563.b3af5c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 851.4527931213379,
-    "y": 1784.4845056533813,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "a3778d99.3c015"
-      ]
-    ]
-  },
-  {
-    "id": "a3778d99.3c015",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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=\"AAI failed\" />\n",
-    "comments": "",
-    "x": 1017.9766731262207,
-    "y": 1796.1035766601562,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "291816ed.18393a",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 858.5480804443359,
-    "y": 1817.246473312378,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "a3778d99.3c015"
-      ]
-    ]
-  },
-  {
-    "id": "ac365c56.4b2",
-    "type": "comment",
-    "name": "Save Resource to AAI",
-    "info": "",
-    "comments": "",
-    "x": 690.5005340576172,
-    "y": 1761.833875656128,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "81ef7e04.cd917",
-    "type": "comment",
-    "name": "Set allotted resource type if not sent by SO",
-    "info": "",
-    "comments": "",
-    "x": 692,
-    "y": 235.00000095367432,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "3718c342.00f4ac",
-    "type": "switchNode",
-    "name": "switch allotted-resource-type",
-    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 653.9233093261719,
-    "y": 275.5660572052002,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "64aa0e9c.b1d09",
-        "7800ea8d.a7f124"
-      ]
-    ]
-  },
-  {
-    "id": "64aa0e9c.b1d09",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 856.9234619140625,
-    "y": 260.56606006622314,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "f530af4a.706e5"
-      ]
-    ]
-  },
-  {
-    "id": "7800ea8d.a7f124",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 849.9232902526855,
-    "y": 300.5660800933838,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "7a986711.0ca2d8"
-      ]
-    ]
-  },
-  {
-    "id": "7a986711.0ca2d8",
-    "type": "set",
-    "name": "set tmp.ar.allotted-resource-type",
-    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
-    "comments": "",
-    "x": 1081.9232749938965,
-    "y": 300.56608486175537,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "369cb772.706cb8",
-    "type": "comment",
-    "name": "For storage in AAI connection-attachment-topology",
-    "info": "",
-    "comments": "",
-    "x": 716.9999618530273,
-    "y": 370.0000009536743,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "492255d4.2adf4c",
-    "type": "comment",
-    "name": "Obtain different URL, template location etc",
-    "info": "For saving resource information to MDSAL & for AAI",
-    "comments": "",
-    "x": 691.9999465942383,
-    "y": 451.8889102935791,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "ddea3893.c96cd8",
-    "type": "comment",
-    "name": "Used for Put AR by id to MDSAL",
-    "info": "",
-    "comments": "",
-    "x": 658.0000305175781,
-    "y": 540.8889274597168,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "a440e95e.3176f8",
-    "type": "comment",
-    "name": "Obtain the last index in services",
-    "info": "ServiceData is added by Provider code",
-    "comments": "",
-    "x": 659.4444732666016,
-    "y": 726.8888721466064,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "a79587b.c624178",
-    "type": "set",
-    "name": "set output to api handler",
-    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
-    "comments": "",
-    "x": 642.2681427001953,
-    "y": 1700.359203338623,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "9d0211a4.58ce8",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 610.6812286376953,
-    "y": 1862.9749298095703,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "f530af4a.706e5",
-    "type": "set",
-    "name": "set tmp.ar.allotted-resource-type",
-    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n",
-    "comments": "",
-    "x": 1096.0001487731934,
-    "y": 260.99998664855957,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "30825693.105b0a",
-    "type": "execute",
-    "name": "execute RestApiCallNode - PUT AR by id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 693.0002746582031,
-    "y": 1634.00013256073,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "7725804e.b7ea",
-        "ff126c78.d9f65",
-        "34ce7aa1.c96186"
-      ]
-    ]
-  },
-  {
-    "id": "7725804e.b7ea",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 942.6416282653809,
-    "y": 1672.3314628601074,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "d7cd6db2.d2286"
-      ]
-    ]
-  },
-  {
-    "id": "ff126c78.d9f65",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 933.6416778564453,
-    "y": 1640.831488609314,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "d7cd6db2.d2286"
-      ]
-    ]
-  },
-  {
-    "id": "34ce7aa1.c96186",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 937.391716003418,
-    "y": 1611.1885934844613,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "6ccc24c6.03b4dc"
-      ]
-    ]
-  },
-  {
-    "id": "d7cd6db2.d2286",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
-    "comments": "",
-    "x": 1103.391716003418,
-    "y": 1641.5815124511719,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "6ccc24c6.03b4dc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1079.0476837158203,
-    "y": 1607.3807626739144,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "7c0d6a4c.141ba4",
-    "type": "execute",
-    "name": "execute RestApiCallNode - Update parent provided service AR",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 757.9999542236328,
-    "y": 1150.000165939331,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "494a716e.866ba",
-        "227c3021.44dc4",
-        "ff8b452c.8d9bc8"
-      ]
-    ]
-  },
-  {
-    "id": "494a716e.866ba",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1066.3080139160156,
-    "y": 1181.998441696167,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "aaeb645f.80fed8"
-      ]
-    ]
-  },
-  {
-    "id": "227c3021.44dc4",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1057.30806350708,
-    "y": 1150.4984674453735,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "aaeb645f.80fed8"
-      ]
-    ]
-  },
-  {
-    "id": "ff8b452c.8d9bc8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1061.0581016540527,
-    "y": 1120.8555723205209,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "74f3a310.0128fc"
-      ]
-    ]
-  },
-  {
-    "id": "aaeb645f.80fed8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
-    "comments": "",
-    "x": 1227.0581016540527,
-    "y": 1151.2484912872314,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "74f3a310.0128fc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1202.714069366455,
-    "y": 1117.047741509974,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9405156b.c649a8",
-    "type": "comment",
-    "name": "Put the parent allotted resource in mdsal",
-    "info": "",
-    "comments": "",
-    "x": 686.9999008178711,
-    "y": 1112.000072479248,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "cf809c65.e205f",
-    "type": "set",
-    "name": "set connection-attachment-ar-identifiers",
-    "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
-    "comments": "",
-    "x": 683.3570861816406,
-    "y": 1314.5716915130615,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "605ed84a.e90ef8",
-    "type": "set",
-    "name": "set ar-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
-    "comments": "",
-    "x": 603.2139129638672,
-    "y": 1282.381194114685,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "5ffc39de.e33178",
-    "type": "set",
-    "name": "set identifiers in overall structure",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
-    "comments": "",
-    "x": 662.1668853759766,
-    "y": 1348.6668767929077,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "b70e6d89.61807",
-    "type": "execute",
-    "name": "execute getTime",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 614.4997253417969,
-    "y": 1422.0004043579102,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2fe0bf35.0314b",
-    "type": "set",
-    "name": "set allotted-resource-oper-status",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
-    "comments": "",
-    "x": 665.4867630004883,
-    "y": 1477.9516372680664,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "4b90a515.ea737c",
-    "type": "set",
-    "name": "set model-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
-    "comments": "",
-    "x": 610.0553817749023,
-    "y": 1383.5557622909546,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "a3fd3ef0.9cf2",
-    "type": "comment",
-    "name": "Prepare data for allotted-resource addition to MDSAL",
-    "info": "This will add to allotted-resource which is present inside service.",
-    "comments": "",
-    "x": 727.3888702392578,
-    "y": 1248.5556087493896,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "aec371b2.f4eb6",
-    "type": "execute",
-    "name": "generate parent-ar url - replace allotted-resource-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 722.5000152587891,
-    "y": 1076.0000114440918,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cc1d8a7e.c8e908",
-    "type": "execute",
-    "name": "generate parent-ar url - replace service-instance-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 718.4999389648438,
-    "y": 1033.000147819519,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "af622d17.e96e6",
-    "type": "comment",
-    "name": "Prepare Parent AR URL",
-    "info": "Preparation to set provided-allotted-resource in parent service instance",
-    "comments": "",
-    "x": 636.5003967285156,
-    "y": 962.0001010894775,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "99b25b64.985da8",
-    "type": "set",
-    "name": "set tmp.ar.parent-service-instance-id",
-    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
-    "comments": "",
-    "x": 675.5001907348633,
-    "y": 995.5000405311584,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "cec76fbc.ec734",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
-    "comments": "",
-    "x": 2232.7569732666016,
-    "y": 833.645830154419,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "6dd5cf93.f0258",
-    "type": "set",
-    "name": "set tmp.found-cidx",
-    "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
-    "comments": "",
-    "x": 1358.6461448669434,
-    "y": 745.3125731945038,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "fcf58d3f.726c9",
-    "type": "comment",
-    "name": "Add to parent services provided-allotted-resources in mdsal",
-    "info": "",
-    "comments": "",
-    "x": 747.2015075683594,
-    "y": 929.9792575836182,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "edb39741.2151b8",
-    "type": "comment",
-    "name": "Add to allotted-resources in mdsal",
-    "info": "",
-    "comments": "",
-    "x": 667.9686965942383,
-    "y": 1215.9689378738403,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "64a66d0e.2cab24",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1341.000051498413,
-    "y": 643.2777614593506,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "c5b1dd9f.c626c"
-      ]
-    ]
-  },
-  {
-    "id": "c5b1dd9f.c626c",
-    "type": "switchNode",
-    "name": "switch cr length",
-    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1528.8574314117432,
-    "y": 643.8968968391418,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "dea64b0a.33d1a8"
-      ]
-    ]
-  },
-  {
-    "id": "dea64b0a.33d1a8",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1728.1905536651611,
-    "y": 643.896975517273,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "fd6c452f.f52a18"
-      ]
-    ]
-  },
-  {
-    "id": "5c590a79.9e0264",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 813.0000534057617,
-    "y": 638.0000371932983,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "83948a24.3af768",
-        "a688402e.6a3a9"
-      ]
-    ]
-  },
-  {
-    "id": "a688402e.6a3a9",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1181.0000839233398,
-    "y": 608.0000352859497,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "a6697dc2.ce9f3"
-      ]
-    ]
-  },
-  {
-    "id": "a6697dc2.ce9f3",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1333.0000839233398,
-    "y": 607.0000352859497,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "adeabb6e.cf7758",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 619.0039215087891,
-    "y": 1553.2500038146973,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "96f36120.1f9af",
-        "6b505cd5.c78924"
-      ]
-    ]
-  },
-  {
-    "id": "96f36120.1f9af",
-    "type": "for",
-    "name": "for each sdwan-get-request-input-param",
-    "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 954.0041198730469,
-    "y": 1499.2501260638237,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "7401fe63.179e9"
-      ]
-    ]
-  },
-  {
-    "id": "4e61fb49.c94114",
-    "type": "comment",
-    "name": "Required for filling template values",
-    "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
-    "comments": "",
-    "x": 976.4486236572266,
-    "y": 1533.0832867622375,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "d4660c0f.147f3",
-    "type": "comment",
-    "name": "Remove VNFC prefix",
-    "info": "",
-    "comments": "",
-    "x": 1037.003963470459,
-    "y": 1455.6944618225098,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "7401fe63.179e9",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1201.0039672851562,
-    "y": 1500.6943712234497,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      [
-        "6a638cf5.ebb554",
-        "3e399a15.de4336"
-      ]
-    ]
-  },
-  {
-    "id": "50ce4566.040d7c",
-    "type": "comment",
-    "name": "Take the parameter names by removing prefix",
-    "info": "",
-    "comments": "",
-    "x": 1469.0038146972656,
-    "y": 1416.250369310379,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "6a638cf5.ebb554",
-    "type": "execute",
-    "name": "execute split parameterName",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1420.0384826660156,
-    "y": 1451.2294654846191,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3e399a15.de4336",
-    "type": "set",
-    "name": "set parameterName",
-    "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
-    "comments": "",
-    "x": 1408.4829559326172,
-    "y": 1555.2294359207153,
-    "z": "77e7049e.a5a37c",
-    "wires": []
-  },
-  {
-    "id": "6b505cd5.c78924",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 995.0039672851562,
-    "y": 1573.2500658035278,
-    "z": "77e7049e.a5a37c",
-    "wires": [
-      []
-    ]
-  }
-]
+[
+  {
+    "id": "41a7b6d3.f9b528",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 104.03125,
+    "y": 62.99999749660492,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "f309be9c.cefce"
+      ]
+    ]
+  },
+  {
+    "id": "f309be9c.cefce",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 287.03125381469727,
+    "y": 137.00001561641693,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "63686a7b.f7aa94"
+      ]
+    ]
+  },
+  {
+    "id": "63686a7b.f7aa94",
+    "type": "method",
+    "name": "sdwan-attachment-topology-operation-create",
+    "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 275.0313720703125,
+    "y": 224.99999845027924,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "445b402d.36165"
+      ]
+    ]
+  },
+  {
+    "id": "445b402d.36165",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 195.03130340576172,
+    "y": 974.0002464056015,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "57abe88c.4f1e28",
+        "da2ee563.ca49c8",
+        "d7db7598.ec6a58",
+        "b1a31713.a74f68",
+        "bb52c8b.9210938",
+        "e248322d.07f73",
+        "e3ed6a01.033e28",
+        "49207aa3.305be4",
+        "e7fc7beb.0c2218",
+        "fff0be1d.b2bcf",
+        "6737ccd9.1b9484",
+        "3d98ece2.536f54",
+        "279d04d9.311b7c",
+        "bd2101b.463ff",
+        "a593e64c.edffe8",
+        "ad258829.1a9fb8",
+        "d28d77a4.947808",
+        "b3ca8b3e.e57468",
+        "4f85eb.0fdeca14",
+        "4b8ef133.24669",
+        "3a0fc26c.48c2fe",
+        "13f594ad.41064b",
+        "571ae355.45c2fc",
+        "936a519f.07274"
+      ]
+    ]
+  },
+  {
+    "id": "f44d3a22.e968a8",
+    "type": "comment",
+    "name": "Set allotted resource id if not sent by SO",
+    "info": "",
+    "comments": "",
+    "x": 679.1080017089844,
+    "y": 134.43391740322113,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "57abe88c.4f1e28",
+    "type": "switchNode",
+    "name": "switch allotted-resource-id",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 625.0312805175781,
+    "y": 189.9999908208847,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "4ebc9e25.f0a41",
+        "c5e852a7.8a1b7"
+      ]
+    ]
+  },
+  {
+    "id": "4ebc9e25.f0a41",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 823.0313682556152,
+    "y": 159.9999793767929,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "80de8467.db5608"
+      ]
+    ]
+  },
+  {
+    "id": "c5e852a7.8a1b7",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 822.0312767028809,
+    "y": 196.9999898672104,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "f37c96f7.6c5a88"
+      ]
+    ]
+  },
+  {
+    "id": "f37c96f7.6c5a88",
+    "type": "set",
+    "name": "set tmp.ar.allotted-resource-id",
+    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
+    "comments": "",
+    "x": 1020.0312652587891,
+    "y": 194.00000894069672,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "da2ee563.ca49c8",
+    "type": "set",
+    "name": "set tmp.ar.self-link",
+    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
+    "comments": "",
+    "x": 593.0312042236328,
+    "y": 411.00009763240814,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "d7db7598.ec6a58",
+    "type": "execute",
+    "name": "execute Properties",
+    "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' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 593.2931213378906,
+    "y": 492.666778922081,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b1a31713.a74f68",
+    "type": "execute",
+    "name": "generate allotted-resource tmp.ar-url",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 646.2931823730469,
+    "y": 579.6666969060898,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "80de8467.db5608",
+    "type": "execute",
+    "name": "execute tmp.ar.allotted-resource-id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1038.0313453674316,
+    "y": 160.9999850988388,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "827e9a97.124e48"
+      ]
+    ]
+  },
+  {
+    "id": "827e9a97.124e48",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1256.0313873291016,
+    "y": 160.99994885921478,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "153037d4.5daa68"
+      ]
+    ]
+  },
+  {
+    "id": "153037d4.5daa68",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
+    "comments": "",
+    "x": 1422.0313415527344,
+    "y": 160.99996316432953,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "8fcb37f5.98d048",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1152.0314807891846,
+    "y": 651.7778695821762,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "91db96ee.5f5ab8"
+      ]
+    ]
+  },
+  {
+    "id": "bc59ed7b.1de9c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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: Existing connection attachment allotted resource\" />\n    \n",
+    "comments": "",
+    "x": 1885.5498600006104,
+    "y": 652.8439410924911,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "b0f210fa.eabdf",
+    "type": "comment",
+    "name": "Check for non existence of allotted resource",
+    "info": "",
+    "comments": "",
+    "x": 1008.0314025878906,
+    "y": 585.7779363393784,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "a2101ce1.011fb",
+    "type": "for",
+    "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
+    "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1528.6979484558105,
+    "y": 796.0000487565994,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "f78e26b6.71e388"
+      ]
+    ]
+  },
+  {
+    "id": "e248322d.07f73",
+    "type": "switchNode",
+    "name": "switch service-data.consumed-allotted-resources_length",
+    "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 710.6972732543945,
+    "y": 772.7140811681747,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "30dfa22f.78a2de",
+        "3fbb9163.26209e"
+      ]
+    ]
+  },
+  {
+    "id": "30dfa22f.78a2de",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1014.8401718139648,
+    "y": 741.5715183019638,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "a8a680b4.767d6"
+      ]
+    ]
+  },
+  {
+    "id": "3fbb9163.26209e",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 991.8402214050293,
+    "y": 802.5714734792709,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c3b51f9c.33bcc"
+      ]
+    ]
+  },
+  {
+    "id": "c3b51f9c.33bcc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1151.9673118591309,
+    "y": 800.6974500417709,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "a2101ce1.011fb",
+        "e3a80e4a.14e7d",
+        "6c9a2abd.a627f4"
+      ]
+    ]
+  },
+  {
+    "id": "a8a680b4.767d6",
+    "type": "set",
+    "name": "set cidx",
+    "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
+    "comments": "",
+    "x": 1164.6971549987793,
+    "y": 739.2855685949326,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "e3ed6a01.033e28",
+    "type": "set",
+    "name": "set consumed allotted resources",
+    "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
+    "comments": "",
+    "x": 639.5545654296875,
+    "y": 876.2856458425522,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "e3a80e4a.14e7d",
+    "type": "switchNode",
+    "name": "switch tmp.found-cidx",
+    "xml": "<switch test='`$tmp.found-cidx`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1341.0823593139648,
+    "y": 832.7089728116989,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "cbb92020.3ddcd"
+      ]
+    ]
+  },
+  {
+    "id": "cbb92020.3ddcd",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1531.0823135375977,
+    "y": 832.708909869194,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "808efd55.65f55"
+      ]
+    ]
+  },
+  {
+    "id": "808efd55.65f55",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1697.0823135375977,
+    "y": 832.708909869194,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "6d2d79a2.093ad8"
+      ]
+    ]
+  },
+  {
+    "id": "f78e26b6.71e388",
+    "type": "switchNode",
+    "name": "switch allotted-resource-id",
+    "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1945.8095779418945,
+    "y": 793.0000756978989,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "b1c9d43a.bd2f08"
+      ]
+    ]
+  },
+  {
+    "id": "b1c9d43a.bd2f08",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2127.619152069092,
+    "y": 793.4645227193832,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "1288ae5b.1e1ce2"
+      ]
+    ]
+  },
+  {
+    "id": "6d2d79a2.093ad8",
+    "type": "set",
+    "name": "set tmp.cidx",
+    "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
+    "comments": "",
+    "x": 1858.955696105957,
+    "y": 832.2206109762192,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "8e24c24b.d6fc2",
+    "type": "comment",
+    "name": "Add to consumed service consumed-allotted-resources in mdsal",
+    "info": "Prepare data and add to service-data",
+    "comments": "",
+    "x": 731.698486328125,
+    "y": 703.0000451803207,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "2cffaf1f.4fc49",
+    "type": "comment",
+    "name": "This set resource will be added to MDSAL by provider code",
+    "info": "Below we add to service-data.consumed-allotted-resource at last index",
+    "comments": "",
+    "x": 719.0314025878906,
+    "y": 841.7781375646591,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "571ae355.45c2fc",
+    "type": "update",
+    "name": "save AAI allotted-resource",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 629.7221069335938,
+    "y": 1801.531901717186,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "bad0c727.d486c8",
+        "6744df38.44f3c"
+      ]
+    ]
+  },
+  {
+    "id": "bad0c727.d486c8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 824.4840431213379,
+    "y": 1792.4845031499863,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "be610d32.68478"
+      ]
+    ]
+  },
+  {
+    "id": "be610d32.68478",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"AAI failed\" />\n",
+    "comments": "",
+    "x": 991.0079231262207,
+    "y": 1804.1035741567612,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "6744df38.44f3c",
+    "type": "failure",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 831.5793304443359,
+    "y": 1825.2464708089828,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "be610d32.68478"
+      ]
+    ]
+  },
+  {
+    "id": "7ddcb0e1.3b36d",
+    "type": "comment",
+    "name": "Save Resource to AAI",
+    "info": "",
+    "comments": "",
+    "x": 663.5317840576172,
+    "y": 1769.8338731527328,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "42977fdb.9150a",
+    "type": "comment",
+    "name": "Set allotted resource type if not sent by SO",
+    "info": "",
+    "comments": "",
+    "x": 665.03125,
+    "y": 242.99999845027924,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "bb52c8b.9210938",
+    "type": "switchNode",
+    "name": "switch allotted-resource-type",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 626.9545593261719,
+    "y": 283.5660547018051,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "ebcdd7cc.5ddb28",
+        "5e1b4704.ff03b8"
+      ]
+    ]
+  },
+  {
+    "id": "ebcdd7cc.5ddb28",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 829.9547119140625,
+    "y": 268.56605756282806,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "e292f924.218148"
+      ]
+    ]
+  },
+  {
+    "id": "5e1b4704.ff03b8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 822.9545402526855,
+    "y": 308.5660775899887,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "bc4b0c6b.6b5dc"
+      ]
+    ]
+  },
+  {
+    "id": "bc4b0c6b.6b5dc",
+    "type": "set",
+    "name": "set tmp.ar.allotted-resource-type",
+    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
+    "comments": "",
+    "x": 1054.9545249938965,
+    "y": 308.5660823583603,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "e49aa8f1.f12588",
+    "type": "comment",
+    "name": "For storage in AAI connection-attachment-topology",
+    "info": "",
+    "comments": "",
+    "x": 690.0312118530273,
+    "y": 377.99999845027924,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "c0fccf31.3b1b7",
+    "type": "comment",
+    "name": "Obtain different URL, template location etc",
+    "info": "For saving resource information to MDSAL & for AAI",
+    "comments": "",
+    "x": 665.0311965942383,
+    "y": 459.888907790184,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "100bd889.c313d7",
+    "type": "comment",
+    "name": "Used for Put AR by id to MDSAL",
+    "info": "",
+    "comments": "",
+    "x": 631.0312805175781,
+    "y": 548.8889249563217,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "18c10c65.2f90b4",
+    "type": "comment",
+    "name": "Obtain the last index in services",
+    "info": "ServiceData is added by Provider code",
+    "comments": "",
+    "x": 632.4757232666016,
+    "y": 734.8888696432114,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "4f85eb.0fdeca14",
+    "type": "set",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+    "comments": "",
+    "x": 615.2993927001953,
+    "y": 1708.359200835228,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "4b8ef133.24669",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 583.7125244140625,
+    "y": 1957.974946975708,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "e292f924.218148",
+    "type": "set",
+    "name": "set tmp.ar.allotted-resource-type",
+    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n",
+    "comments": "",
+    "x": 1069.0313987731934,
+    "y": 268.9999841451645,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "b3ca8b3e.e57468",
+    "type": "execute",
+    "name": "execute RestApiCallNode - PUT AR by id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sdwan-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 666.0315246582031,
+    "y": 1642.000130057335,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "891b6f50.0b8ca",
+        "17f28b89.81c5a4",
+        "6238cca6.7c6784"
+      ]
+    ]
+  },
+  {
+    "id": "891b6f50.0b8ca",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 915.6728782653809,
+    "y": 1680.3314603567123,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c7ada304.940bb"
+      ]
+    ]
+  },
+  {
+    "id": "17f28b89.81c5a4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 906.6729278564453,
+    "y": 1648.8314861059189,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c7ada304.940bb"
+      ]
+    ]
+  },
+  {
+    "id": "6238cca6.7c6784",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 910.422966003418,
+    "y": 1619.1885909810662,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "9d842474.1d5df8"
+      ]
+    ]
+  },
+  {
+    "id": "c7ada304.940bb",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
+    "comments": "",
+    "x": 1076.422966003418,
+    "y": 1649.5815099477768,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "9d842474.1d5df8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1052.0789337158203,
+    "y": 1615.3807601705194,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6737ccd9.1b9484",
+    "type": "execute",
+    "name": "execute RestApiCallNode - Update parent provided service AR",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 731.0312042236328,
+    "y": 1158.000163435936,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "ce9d67c0.fef428",
+        "32ea0966.e31a46",
+        "8052d936.8da758"
+      ]
+    ]
+  },
+  {
+    "id": "ce9d67c0.fef428",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1039.3392639160156,
+    "y": 1189.998439192772,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "cecd64fe.528bd8"
+      ]
+    ]
+  },
+  {
+    "id": "32ea0966.e31a46",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1030.33931350708,
+    "y": 1158.4984649419785,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "cecd64fe.528bd8"
+      ]
+    ]
+  },
+  {
+    "id": "8052d936.8da758",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1034.0893516540527,
+    "y": 1128.8555698171258,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c4a631eb.caa38"
+      ]
+    ]
+  },
+  {
+    "id": "cecd64fe.528bd8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
+    "comments": "",
+    "x": 1200.0893516540527,
+    "y": 1159.2484887838364,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "c4a631eb.caa38",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.745319366455,
+    "y": 1125.047739006579,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9c5665b2.ee98f8",
+    "type": "comment",
+    "name": "Put the parent allotted resource in mdsal",
+    "info": "",
+    "comments": "",
+    "x": 660.0311508178711,
+    "y": 1120.000069975853,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "279d04d9.311b7c",
+    "type": "set",
+    "name": "set connection-attachment-ar-identifiers",
+    "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
+    "comments": "",
+    "x": 656.3883361816406,
+    "y": 1322.5716890096664,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "3d98ece2.536f54",
+    "type": "set",
+    "name": "set ar-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
+    "comments": "",
+    "x": 576.2451629638672,
+    "y": 1290.38119161129,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "bd2101b.463ff",
+    "type": "set",
+    "name": "set identifiers in overall structure",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
+    "comments": "",
+    "x": 635.1981353759766,
+    "y": 1356.6668742895126,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "a593e64c.edffe8",
+    "type": "execute",
+    "name": "execute getTime",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 587.5309753417969,
+    "y": 1430.000401854515,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ad258829.1a9fb8",
+    "type": "set",
+    "name": "set allotted-resource-oper-status",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+    "comments": "",
+    "x": 638.5180130004883,
+    "y": 1485.9516347646713,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "d28d77a4.947808",
+    "type": "set",
+    "name": "set model-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
+    "comments": "",
+    "x": 583.0866317749023,
+    "y": 1391.5557597875595,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "23859bfe.f043f4",
+    "type": "comment",
+    "name": "Prepare data for allotted-resource addition to MDSAL",
+    "info": "This will add to allotted-resource which is present inside service.",
+    "comments": "",
+    "x": 700.4201202392578,
+    "y": 1256.5556062459946,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "fff0be1d.b2bcf",
+    "type": "execute",
+    "name": "generate parent-ar url - replace allotted-resource-id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 695.5312652587891,
+    "y": 1084.0000089406967,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e7fc7beb.0c2218",
+    "type": "execute",
+    "name": "generate parent-ar url - replace service-instance-id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 691.5311889648438,
+    "y": 1041.000145316124,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "80cf2b3b.3e92b8",
+    "type": "comment",
+    "name": "Prepare Parent AR URL",
+    "info": "Preparation to set provided-allotted-resource in parent service instance",
+    "comments": "",
+    "x": 609.5316467285156,
+    "y": 970.0000985860825,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "49207aa3.305be4",
+    "type": "set",
+    "name": "set tmp.ar.parent-service-instance-id",
+    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
+    "comments": "",
+    "x": 648.5314407348633,
+    "y": 1003.5000380277634,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "1288ae5b.1e1ce2",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
+    "comments": "",
+    "x": 2205.7882232666016,
+    "y": 841.6458276510239,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "6c9a2abd.a627f4",
+    "type": "set",
+    "name": "set tmp.found-cidx",
+    "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
+    "comments": "",
+    "x": 1331.6773948669434,
+    "y": 753.3125706911087,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "57452405.e26b5c",
+    "type": "comment",
+    "name": "Add to parent services provided-allotted-resources in mdsal",
+    "info": "",
+    "comments": "",
+    "x": 720.2327575683594,
+    "y": 937.9792550802231,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "6013a8b1.8cfec8",
+    "type": "comment",
+    "name": "Add to allotted-resources in mdsal",
+    "info": "",
+    "comments": "",
+    "x": 640.9999465942383,
+    "y": 1223.9689353704453,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "91db96ee.5f5ab8",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1314.031301498413,
+    "y": 651.2777589559555,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "d36cd8c7.bbc8c8"
+      ]
+    ]
+  },
+  {
+    "id": "d36cd8c7.bbc8c8",
+    "type": "switchNode",
+    "name": "switch cr length",
+    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1501.8886814117432,
+    "y": 651.8968943357468,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c670c701.c3ff18"
+      ]
+    ]
+  },
+  {
+    "id": "c670c701.c3ff18",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1701.2218036651611,
+    "y": 651.8969730138779,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "bc59ed7b.1de9c"
+      ]
+    ]
+  },
+  {
+    "id": "3a0fc26c.48c2fe",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 786.0313034057617,
+    "y": 646.0000346899033,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "8fcb37f5.98d048",
+        "230adea5.52af62"
+      ]
+    ]
+  },
+  {
+    "id": "230adea5.52af62",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1154.0313339233398,
+    "y": 616.0000327825546,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "f02fcbfc.47bf28"
+      ]
+    ]
+  },
+  {
+    "id": "f02fcbfc.47bf28",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1306.0313339233398,
+    "y": 615.0000327825546,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "13f594ad.41064b",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 592.0351715087891,
+    "y": 1561.2500013113022,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c4d3876.e194578",
+        "a56d9e1e.69cb5"
+      ]
+    ]
+  },
+  {
+    "id": "c4d3876.e194578",
+    "type": "for",
+    "name": "for each sdwan-get-request-input-param",
+    "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 927.0353698730469,
+    "y": 1507.2501235604286,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "c009da24.7d2598"
+      ]
+    ]
+  },
+  {
+    "id": "654cbf55.2b8ad",
+    "type": "comment",
+    "name": "Required for filling template values",
+    "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
+    "comments": "",
+    "x": 949.4798736572266,
+    "y": 1541.0832842588425,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "eaf3595.bafe4a8",
+    "type": "comment",
+    "name": "Remove VNFC prefix",
+    "info": "",
+    "comments": "",
+    "x": 1010.035213470459,
+    "y": 1463.6944593191147,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "c009da24.7d2598",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1174.0352172851562,
+    "y": 1508.6943687200546,
+    "z": "588621bb.e9fef",
+    "wires": [
+      [
+        "447c6486.c17b2c",
+        "fb95c554.72d748"
+      ]
+    ]
+  },
+  {
+    "id": "6b76a58c.b29a1c",
+    "type": "comment",
+    "name": "Take the parameter names by removing prefix",
+    "info": "",
+    "comments": "",
+    "x": 1442.0350646972656,
+    "y": 1424.250366806984,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "447c6486.c17b2c",
+    "type": "execute",
+    "name": "execute split parameterName",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1393.0697326660156,
+    "y": 1459.229462981224,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fb95c554.72d748",
+    "type": "set",
+    "name": "set parameterName",
+    "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+    "comments": "",
+    "x": 1381.5142059326172,
+    "y": 1563.2294334173203,
+    "z": "588621bb.e9fef",
+    "wires": []
+  },
+  {
+    "id": "a56d9e1e.69cb5",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 968.0352172851562,
+    "y": 1581.2500633001328,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "936a519f.07274",
+    "type": "save",
+    "name": "save allotted relationship in AAI",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id\" \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"allotted-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/business/customers/customer/' + $connection-attachment-topology-operation-input.service-information.global-customer-id + '/service-subscriptions/service-subscription/' + $connection-attachment-topology-operation-input.service-information.subscription-service-type + '/service-instances/service-instance/' + $connection-attachment-topology-operation-input.service-information.service-instance-id + '/allotted-resources/allotted-resource/' + $tmp.ar.allotted-resource-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"allotted-resource.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 641.0312767028809,
+    "y": 1884.531162261963,
+    "z": "588621bb.e9fef",
+    "wires": [
+      []
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
index 919c397a..d0888583 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
@@ -1,212 +1,212 @@
-[
-  {
-    "id": "30fe9468.76f32c",
-    "type": "get-resource",
-    "name": "get-resource service-subscription",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">\n      \n",
-    "comments": "",
-    "outputs": 1,
-    "x": 632.8652648925781,
-    "y": 374.2938051223755,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "a889eb39.2fcd08",
-        "483504b1.ecba4c"
-      ]
-    ]
-  },
-  {
-    "id": "516f9f53.00463",
-    "type": "switchNode",
-    "name": "switch temp-ub-sub-account-id",
-    "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1044.8653564453125,
-    "y": 339.0438861846924,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "f1e993a3.ae05f",
-        "6af3c030.9694c"
-      ]
-    ]
-  },
-  {
-    "id": "f1e993a3.ae05f",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1237.5798072814941,
-    "y": 313.043927192688,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "be0f95e9.861918"
-      ]
-    ]
-  },
-  {
-    "id": "6af3c030.9694c",
-    "type": "other",
-    "name": "Other",
-    "xml": "<outcome value='Other'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1237.8653717041016,
-    "y": 368.04388999938965,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "3bf7a2b9.96247e"
-      ]
-    ]
-  },
-  {
-    "id": "a889eb39.2fcd08",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 843.3651275634766,
-    "y": 347.0398635864258,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "516f9f53.00463"
-      ]
-    ]
-  },
-  {
-    "id": "483504b1.ecba4c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 837.0437164306641,
-    "y": 399.2541751861572,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "212060fe.4fc32"
-      ]
-    ]
-  },
-  {
-    "id": "212060fe.4fc32",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 989.7937164306641,
-    "y": 399.0042362213135,
-    "z": "97aa802d.404bc",
-    "wires": []
-  },
-  {
-    "id": "b6a8c3c7.8bc03",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "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}'>",
-    "outputs": 1,
-    "x": 212.86526489257812,
-    "y": 101.43669128417969,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "68fe5032.b2685"
-      ]
-    ]
-  },
-  {
-    "id": "f788aa3b.dab3e8",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 133.57955932617188,
-    "y": 39.19858169555664,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "b6a8c3c7.8bc03"
-      ]
-    ]
-  },
-  {
-    "id": "672a5bc8.7ace04",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 366.81766510009766,
-    "y": 338.0081157684326,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "30fe9468.76f32c",
-        "ef87bbc7.0bf428"
-      ]
-    ]
-  },
-  {
-    "id": "68fe5032.b2685",
-    "type": "method",
-    "name": "method sdwan-get-tenant-auth",
-    "xml": "<method rpc='sdwan-get-tenant-auth' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 224.57955932617188,
-    "y": 195.7849235534668,
-    "z": "97aa802d.404bc",
-    "wires": [
-      [
-        "672a5bc8.7ace04"
-      ]
-    ]
-  },
-  {
-    "id": "3bf7a2b9.96247e",
-    "type": "set",
-    "name": "set prop.tenant-id",
-    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",
-    "comments": "",
-    "x": 1415.7224426269531,
-    "y": 367.15094566345215,
-    "z": "97aa802d.404bc",
-    "wires": []
-  },
-  {
-    "id": "ef87bbc7.0bf428",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create tenant auth",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 660.3652954101562,
-    "y": 477.1866149902344,
-    "z": "97aa802d.404bc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "be0f95e9.861918",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 1420.0080490112305,
-    "y": 312.86523628234863,
-    "z": "97aa802d.404bc",
-    "wires": []
-  }
-]
+[
+  {
+    "id": "b8581db5.dbca7",
+    "type": "get-resource",
+    "name": "get-resource service-subscription",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data-tenant\">\n      \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 597,
+    "y": 418.09522092342377,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "1a771e75.f79d12",
+        "ac62029.181ce"
+      ]
+    ]
+  },
+  {
+    "id": "5d45ba87.92c374",
+    "type": "switchNode",
+    "name": "switch temp-ub-sub-account-id",
+    "xml": "<switch test='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1009.0000915527344,
+    "y": 382.84530198574066,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "5358b5db.d1e49c",
+        "28c300d9.7fa36"
+      ]
+    ]
+  },
+  {
+    "id": "5358b5db.d1e49c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1201.714542388916,
+    "y": 356.84534299373627,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "831b80bb.e08e8"
+      ]
+    ]
+  },
+  {
+    "id": "28c300d9.7fa36",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1202.0001068115234,
+    "y": 411.8453058004379,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "e1a74ece.52f65"
+      ]
+    ]
+  },
+  {
+    "id": "1a771e75.f79d12",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 807.4998626708984,
+    "y": 390.84127938747406,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "5d45ba87.92c374"
+      ]
+    ]
+  },
+  {
+    "id": "ac62029.181ce",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 801.1784515380859,
+    "y": 443.0555909872055,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "f81e2009.7dbd5"
+      ]
+    ]
+  },
+  {
+    "id": "f81e2009.7dbd5",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 953.9284515380859,
+    "y": 442.80565202236176,
+    "z": "a703782b.2992b8",
+    "wires": []
+  },
+  {
+    "id": "4bd31b43.411d14",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 177,
+    "y": 145.23810708522797,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "d79d2c6f.11854"
+      ]
+    ]
+  },
+  {
+    "id": "c863bd10.503ce",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 97.71429443359375,
+    "y": 82.99999749660492,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "4bd31b43.411d14"
+      ]
+    ]
+  },
+  {
+    "id": "5dc11f37.9dd37",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 330.95240020751953,
+    "y": 381.8095315694809,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "b8581db5.dbca7",
+        "c8c0bf77.157a7"
+      ]
+    ]
+  },
+  {
+    "id": "d79d2c6f.11854",
+    "type": "method",
+    "name": "method sdwan-get-tenant-auth",
+    "xml": "<method rpc='sdwan-get-tenant-auth' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 188.71429443359375,
+    "y": 239.58633935451508,
+    "z": "a703782b.2992b8",
+    "wires": [
+      [
+        "5dc11f37.9dd37"
+      ]
+    ]
+  },
+  {
+    "id": "e1a74ece.52f65",
+    "type": "set",
+    "name": "set prop.tenant-id",
+    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data-tenant.temp-ub-sub-account-id`' />\n",
+    "comments": "",
+    "x": 1379.857177734375,
+    "y": 410.9523614645004,
+    "z": "a703782b.2992b8",
+    "wires": []
+  },
+  {
+    "id": "c8c0bf77.157a7",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant auth",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 624.5000305175781,
+    "y": 520.9880307912827,
+    "z": "a703782b.2992b8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "831b80bb.e08e8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 1384.1427841186523,
+    "y": 356.6666520833969,
+    "z": "a703782b.2992b8",
+    "wires": []
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
index 3f7cbdc4..9d8b0292 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
@@ -1,847 +1,847 @@
-[
-  {
-    "id": "b728dcab.e2e08",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 93,
-    "y": 47,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "f1013e83.11195"
-      ]
-    ]
-  },
-  {
-    "id": "f1013e83.11195",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "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}'>",
-    "outputs": 1,
-    "x": 279.00000381469727,
-    "y": 119.0000171661377,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "4636719f.41274"
-      ]
-    ]
-  },
-  {
-    "id": "4636719f.41274",
-    "type": "method",
-    "name": "method sdwan-network-topology-operation-activate",
-    "xml": "<method rpc='sdwan-network-topology-operation-activate' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 267.0001220703125,
-    "y": 207,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "c7a7aadf.8ed488"
-      ]
-    ]
-  },
-  {
-    "id": "c7a7aadf.8ed488",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 441.00001525878906,
-    "y": 315.0000591278076,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "98d3b92f.70fc48",
-        "189da6d2.5a6819",
-        "e988ff0f.b5aae",
-        "e4aad21c.e7ff7",
-        "39e02c84.3177e4",
-        "b96459be.6fd7a8",
-        "747d96dd.f43d58",
-        "39860903.53b456",
-        "69af4cc7.202f04",
-        "bc16f27b.ec50b",
-        "29cb6e2b.ecafd2",
-        "f71b9190.340d8",
-        "3eb35468.4702ac",
-        "d3877bd.f214188",
-        "73dbb3c3.f1d1fc",
-        "9bf6657f.dd37a8"
-      ]
-    ]
-  },
-  {
-    "id": "98d3b92f.70fc48",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 899.3889007568359,
-    "y": 64,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "189da6d2.5a6819",
-    "type": "record",
-    "name": "record",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 699.5555992126465,
-    "y": 117.77785301208496,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "e988ff0f.b5aae",
-    "type": "set",
-    "name": "set networkId and network-object-path",
-    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
-    "comments": "",
-    "x": 786.5558776855469,
-    "y": 1040.313469171524,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "e4aad21c.e7ff7",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 708.3336791992188,
-    "y": 1229.868889093399,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "39e02c84.3177e4",
-    "type": "set",
-    "name": "set network-level-oper-status",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
-    "comments": "",
-    "x": 753.4447937011719,
-    "y": 1101.5356438159943,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "b96459be.6fd7a8",
-    "type": "execute",
-    "name": "execute Properties",
-    "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' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 731.8577041625977,
-    "y": 170.77788925170898,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "747d96dd.f43d58",
-    "type": "update",
-    "name": "update SDWAN VPN status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
-    "comments": "",
-    "outputs": 1,
-    "x": 770.6635093688965,
-    "y": 1164.2388553619385,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "39860903.53b456",
-    "type": "set",
-    "name": "set network in service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
-    "comments": "",
-    "x": 747.0004081726074,
-    "y": 987.0913031101227,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "69af4cc7.202f04",
-    "type": "for",
-    "name": "for each network-input-parameters",
-    "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 784,
-    "y": 241.00390753149986,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "e4f0bee4.ba4a3"
-      ]
-    ]
-  },
-  {
-    "id": "e4f0bee4.ba4a3",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1040.8334312438965,
-    "y": 175.33725866675377,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "9e11c248.9eb9d",
-        "9793f672.805878"
-      ]
-    ]
-  },
-  {
-    "id": "9e11c248.9eb9d",
-    "type": "switchNode",
-    "name": "switch name",
-    "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1231.8334922790527,
-    "y": 171.33729109168053,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "8c9ad24.52d233"
-      ]
-    ]
-  },
-  {
-    "id": "8c9ad24.52d233",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1405.8336181640625,
-    "y": 171.3372949063778,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "360dce92.bcd8b2"
-      ]
-    ]
-  },
-  {
-    "id": "360dce92.bcd8b2",
-    "type": "set",
-    "name": "set name",
-    "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1568.8335037231445,
-    "y": 170.93728956580162,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "f71b9190.340d8",
-    "type": "get-resource",
-    "name": "get-resource esr-thirdparty-sdnc",
-    "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 = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 778,
-    "y": 350.00390625,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "35c5eced.422b74",
-        "5db3feca.9679c",
-        "84542dcd.8c846"
-      ]
-    ]
-  },
-  {
-    "id": "35c5eced.422b74",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1023,
-    "y": 296.00390753149986,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "b858bea3.dfbd9"
-      ]
-    ]
-  },
-  {
-    "id": "5db3feca.9679c",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1026.490966796875,
-    "y": 343.5779431760311,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "ea674168.c4155"
-      ]
-    ]
-  },
-  {
-    "id": "84542dcd.8c846",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1021.823974609375,
-    "y": 384.91125616431236,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "95ebd94d.24be88"
-      ]
-    ]
-  },
-  {
-    "id": "b858bea3.dfbd9",
-    "type": "set",
-    "name": "set controller data",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
-    "comments": "",
-    "x": 1220.5000610351562,
-    "y": 284.00390753149986,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "ea674168.c4155",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 1203.0623779296875,
-    "y": 331.8636792600155,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "95ebd94d.24be88",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 1209.5965309143066,
-    "y": 380.350448936224,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "3eb35468.4702ac",
-    "type": "execute",
-    "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 786,
-    "y": 461.00390625,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "d801cca4.51d79",
-        "c1258051.e7f45"
-      ]
-    ]
-  },
-  {
-    "id": "d801cca4.51d79",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1025.000072479248,
-    "y": 439.00393772125244,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "f717dae9.6ebf18"
-      ]
-    ]
-  },
-  {
-    "id": "c1258051.e7f45",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1017.250072479248,
-    "y": 492.6468210220337,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "d37810c8.811c7"
-      ]
-    ]
-  },
-  {
-    "id": "f717dae9.6ebf18",
-    "type": "set",
-    "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
-    "comments": "",
-    "x": 1175,
-    "y": 440.00390625,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "d37810c8.811c7",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 1170.000072479248,
-    "y": 492.39688205718994,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "9793f672.805878",
-    "type": "switchNode",
-    "name": "switch topology",
-    "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1230.25,
-    "y": 224.00390753149986,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "cfe36c58.4801f"
-      ]
-    ]
-  },
-  {
-    "id": "cfe36c58.4801f",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1404.2501258850098,
-    "y": 224.00391134619713,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "3cd1ca28.cc1526"
-      ]
-    ]
-  },
-  {
-    "id": "3cd1ca28.cc1526",
-    "type": "set",
-    "name": "set topology",
-    "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1567.2500114440918,
-    "y": 223.60390600562096,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "d3877bd.f214188",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 707.7500457763672,
-    "y": 707.0040292739868,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "7110150.fd1e8ec"
-      ]
-    ]
-  },
-  {
-    "id": "7110150.fd1e8ec",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create network orchestration",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"orchestration-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1028.2501525878906,
-    "y": 696.0041122436523,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "bc16f27b.ec50b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 710.2500152587891,
-    "y": 769.0039575994015,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "39c058d0.1d59d8",
-        "4d96e12b.86876",
-        "50f144c4.b6b2ac"
-      ]
-    ]
-  },
-  {
-    "id": "4d96e12b.86876",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create vpn",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"post\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 981.7500610351562,
-    "y": 759.0040815770626,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "39c058d0.1d59d8",
-    "type": "set",
-    "name": "set prop.vpn-id and prop.vpn1Id",
-    "xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n",
-    "comments": "",
-    "x": 977.7502174377441,
-    "y": 811.0041809082031,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "50f144c4.b6b2ac",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create vpn topology",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\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=\"post\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1009.2500648498535,
-    "y": 863.0039558410645,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "29cb6e2b.ecafd2",
-    "type": "set",
-    "name": "set tenant-id to service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
-    "comments": "",
-    "x": 745.2501525878906,
-    "y": 904.7540903091431,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "9bf6657f.dd37a8",
-    "type": "get-resource",
-    "name": "get-resource service-subscription",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n      \n",
-    "comments": "",
-    "outputs": 1,
-    "x": 762.0715408325195,
-    "y": 611.6825218200684,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "fbe99e6e.4017e",
-        "457e75b8.5e8e7c"
-      ]
-    ]
-  },
-  {
-    "id": "ba35b9dd.539428",
-    "type": "switchNode",
-    "name": "switch temp-ub-sub-account-id",
-    "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1174.071632385254,
-    "y": 576.4326028823853,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "76b51f1a.0801",
-        "efbb35c.45c87c8"
-      ]
-    ]
-  },
-  {
-    "id": "76b51f1a.0801",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1366.78609085083,
-    "y": 550.432635307312,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "a2a000be.ae6b"
-      ]
-    ]
-  },
-  {
-    "id": "efbb35c.45c87c8",
-    "type": "other",
-    "name": "Other",
-    "xml": "<outcome value='Other'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1367.071647644043,
-    "y": 605.4326066970825,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "864dc517.ee5aa8"
-      ]
-    ]
-  },
-  {
-    "id": "5407a489.2a82dc",
-    "type": "set",
-    "name": "set prop.tenant-id",
-    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n",
-    "comments": "",
-    "x": 1614.5002403259277,
-    "y": 690.5754070281982,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "a2a000be.ae6b",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1506.2499885559082,
-    "y": 550.7539038658142,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "d533a7b3.2b7aa8",
-        "68abe37a.a97c3c",
-        "ebb2a924.447738",
-        "3179cec4.da2412",
-        "df370d35.edba",
-        "5f23c930.bf33c8",
-        "d5098f7f.2d7c"
-      ]
-    ]
-  },
-  {
-    "id": "3179cec4.da2412",
-    "type": "set",
-    "name": "set prop.customer-id",
-    "xml": "<set>\n<parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />\n",
-    "comments": "",
-    "x": 1717.8930969238281,
-    "y": 361.3254642486572,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "d533a7b3.2b7aa8",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create tenant",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1776.8929138183594,
-    "y": 491.89675521850586,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "68abe37a.a97c3c",
-    "type": "set",
-    "name": "set prop.tenant-id",
-    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\n",
-    "comments": "",
-    "x": 1729.7502326965332,
-    "y": 616.753984451294,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "ebb2a924.447738",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create tenant auth",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1797.250228881836,
-    "y": 652.503984451294,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "df370d35.edba",
-    "type": "get-resource",
-    "name": "update-resource customer-id in service-subscription",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />\n<!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1821.1786041259766,
-    "y": 552.8968715667725,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fbe99e6e.4017e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 972.571403503418,
-    "y": 584.4285802841187,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "ba35b9dd.539428"
-      ]
-    ]
-  },
-  {
-    "id": "457e75b8.5e8e7c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 966.2499923706055,
-    "y": 636.6428918838501,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "df05b13b.b352c"
-      ]
-    ]
-  },
-  {
-    "id": "df05b13b.b352c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 1118.9999923706055,
-    "y": 636.3929529190063,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "73dbb3c3.f1d1fc",
-    "type": "set",
-    "name": "set  vpn-id to service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
-    "comments": "",
-    "x": 743.5000762939453,
-    "y": 942.5039682388306,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "864dc517.ee5aa8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1425.7224044799805,
-    "y": 688.5795984268188,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      [
-        "5407a489.2a82dc",
-        "75fd5cb0.1720a4"
-      ]
-    ]
-  },
-  {
-    "id": "75fd5cb0.1720a4",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create tenant auth",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1697.1510009765625,
-    "y": 737.1510009765625,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5f23c930.bf33c8",
-    "type": "set",
-    "name": "set prop.userAccount",
-    "xml": "<set>\n<parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />\n<parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />",
-    "comments": "",
-    "x": 1718,
-    "y": 439,
-    "z": "4c287bc.f107e84",
-    "wires": []
-  },
-  {
-    "id": "d5098f7f.2d7c",
-    "type": "execute",
-    "name": "execute concat customer-id and @test.com",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.customer-id`'/>\n    <parameter name=\"outputPath\" value=\"tmp.userAccountEmail\"/>\n    <parameter name=\"target\" value=\"@test.com\"/>\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1793.0038757324219,
-    "y": 403.003942489624,
-    "z": "4c287bc.f107e84",
-    "wires": [
-      []
-    ]
-  }
-]
+[
+  {
+    "id": "803ab026.91f8f",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 107.03125,
+    "y": 31.031251907348633,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "c6313a09.482648"
+      ]
+    ]
+  },
+  {
+    "id": "c6313a09.482648",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 293.03125381469727,
+    "y": 103.03126907348633,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "95ab199b.094c18"
+      ]
+    ]
+  },
+  {
+    "id": "95ab199b.094c18",
+    "type": "method",
+    "name": "method sdwan-network-topology-operation-activate",
+    "xml": "<method rpc='sdwan-network-topology-operation-activate' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 281.0313720703125,
+    "y": 191.03125190734863,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "1c62871.b17ef79"
+      ]
+    ]
+  },
+  {
+    "id": "1c62871.b17ef79",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 455.03126525878906,
+    "y": 299.03131103515625,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "3b3f6a1b.7b4ca6",
+        "4e3bd6cb.ba9f78",
+        "694fbbd7.3f5854",
+        "17e80004.9e42d",
+        "285802e9.ef74ae",
+        "620b9b98.d14b04",
+        "8b0e2661.6611b8",
+        "418307b4.ccc048",
+        "96303f3f.254fa",
+        "2f6a3a39.effb56",
+        "e079dd14.d6c7f",
+        "c053f4f5.ddb828",
+        "9311c45c.c481e8",
+        "f2e5b424.d52178",
+        "9cac03d4.f972",
+        "9720bf6e.06444"
+      ]
+    ]
+  },
+  {
+    "id": "3b3f6a1b.7b4ca6",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 913.4201507568359,
+    "y": 48.03125190734863,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4e3bd6cb.ba9f78",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 713.5868492126465,
+    "y": 101.8091049194336,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "694fbbd7.3f5854",
+    "type": "set",
+    "name": "set networkId and network-object-path",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
+    "comments": "",
+    "x": 800.5871276855469,
+    "y": 1024.3447210788727,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "17e80004.9e42d",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 722.3649291992188,
+    "y": 1213.9001410007477,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "285802e9.ef74ae",
+    "type": "set",
+    "name": "set network-level-oper-status",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
+    "comments": "",
+    "x": 767.4760437011719,
+    "y": 1085.566895723343,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "620b9b98.d14b04",
+    "type": "execute",
+    "name": "execute Properties",
+    "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' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 745.8889541625977,
+    "y": 154.80914115905762,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8b0e2661.6611b8",
+    "type": "update",
+    "name": "update SDWAN VPN status to AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
+    "comments": "",
+    "outputs": 1,
+    "x": 784.6947593688965,
+    "y": 1148.270107269287,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "418307b4.ccc048",
+    "type": "set",
+    "name": "set network in service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
+    "comments": "",
+    "x": 761.0316581726074,
+    "y": 971.1225550174713,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "96303f3f.254fa",
+    "type": "for",
+    "name": "for each network-input-parameters",
+    "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 798.03125,
+    "y": 225.0351594388485,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "ce83acb3.4528a"
+      ]
+    ]
+  },
+  {
+    "id": "ce83acb3.4528a",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1054.8646812438965,
+    "y": 159.3685105741024,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "ecc115d.f7101e8",
+        "d7b4205b.949d1"
+      ]
+    ]
+  },
+  {
+    "id": "ecc115d.f7101e8",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1245.8647422790527,
+    "y": 155.36854299902916,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "f5dbb094.881f6"
+      ]
+    ]
+  },
+  {
+    "id": "f5dbb094.881f6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1419.8648681640625,
+    "y": 155.36854681372643,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "d151144e.a69038"
+      ]
+    ]
+  },
+  {
+    "id": "d151144e.a69038",
+    "type": "set",
+    "name": "set name",
+    "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1582.8647537231445,
+    "y": 154.96854147315025,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "c053f4f5.ddb828",
+    "type": "get-resource",
+    "name": "get-resource esr-thirdparty-sdnc",
+    "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 = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 792.03125,
+    "y": 334.03515815734863,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "6d5ba109.a3671",
+        "90ffe3bf.39fcd",
+        "dbe2a88c.8b12f8"
+      ]
+    ]
+  },
+  {
+    "id": "6d5ba109.a3671",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1037.03125,
+    "y": 280.0351594388485,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "f907f929.492558"
+      ]
+    ]
+  },
+  {
+    "id": "90ffe3bf.39fcd",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1040.522216796875,
+    "y": 327.60919508337975,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "b624a8b6.bf4ac8"
+      ]
+    ]
+  },
+  {
+    "id": "dbe2a88c.8b12f8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1035.855224609375,
+    "y": 368.942508071661,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "7d3f8d7a.844044"
+      ]
+    ]
+  },
+  {
+    "id": "f907f929.492558",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "comments": "",
+    "x": 1234.5313110351562,
+    "y": 268.0351594388485,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "b624a8b6.bf4ac8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1217.0936279296875,
+    "y": 315.8949311673641,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "7d3f8d7a.844044",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1223.6277809143066,
+    "y": 364.3817008435726,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "9311c45c.c481e8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 800.03125,
+    "y": 445.03515815734863,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "e9b6301b.a1571",
+        "27918c6e.3a59a4"
+      ]
+    ]
+  },
+  {
+    "id": "e9b6301b.a1571",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1039.031322479248,
+    "y": 423.0351896286011,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "25b0c9da.a209a6"
+      ]
+    ]
+  },
+  {
+    "id": "27918c6e.3a59a4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1031.281322479248,
+    "y": 476.6780729293823,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "5b42d4fd.ac727c"
+      ]
+    ]
+  },
+  {
+    "id": "25b0c9da.a209a6",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 1189.03125,
+    "y": 424.03515815734863,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "5b42d4fd.ac727c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 1184.031322479248,
+    "y": 476.4281339645386,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "d7b4205b.949d1",
+    "type": "switchNode",
+    "name": "switch topology",
+    "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1244.28125,
+    "y": 208.0351594388485,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "9f3b4d42.904a6"
+      ]
+    ]
+  },
+  {
+    "id": "9f3b4d42.904a6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1418.2813758850098,
+    "y": 208.03516325354576,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "c7a8b800.265778"
+      ]
+    ]
+  },
+  {
+    "id": "c7a8b800.265778",
+    "type": "set",
+    "name": "set topology",
+    "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1581.2812614440918,
+    "y": 207.6351579129696,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "f2e5b424.d52178",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 721.7812957763672,
+    "y": 691.0352811813354,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "be08c0ea.c5f31"
+      ]
+    ]
+  },
+  {
+    "id": "be08c0ea.c5f31",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create network orchestration",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"orchestration-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1042.2814025878906,
+    "y": 680.035364151001,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2f6a3a39.effb56",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 724.2812652587891,
+    "y": 753.0352095067501,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "7ec8c1c5.bf91a",
+        "8dc97b4a.332098",
+        "cd1c7839.bb73a8"
+      ]
+    ]
+  },
+  {
+    "id": "8dc97b4a.332098",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create vpn",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"post\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 995.7813110351562,
+    "y": 743.0353334844112,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7ec8c1c5.bf91a",
+    "type": "set",
+    "name": "set prop.vpn-id and prop.vpn1Id",
+    "xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n",
+    "comments": "",
+    "x": 991.7814674377441,
+    "y": 795.0354328155518,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "cd1c7839.bb73a8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create vpn topology",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\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=\"post\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1023.2813148498535,
+    "y": 847.0352077484131,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e079dd14.d6c7f",
+    "type": "set",
+    "name": "set tenant-id to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
+    "comments": "",
+    "x": 759.2814025878906,
+    "y": 888.7853422164917,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "9720bf6e.06444",
+    "type": "get-resource",
+    "name": "get-resource service-subscription",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n      \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 776.1027908325195,
+    "y": 595.713773727417,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "bbcbdc4.862f32",
+        "4736bcfb.a0c9e4"
+      ]
+    ]
+  },
+  {
+    "id": "b8d38e16.8f50d",
+    "type": "switchNode",
+    "name": "switch temp-ub-sub-account-id",
+    "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1188.102882385254,
+    "y": 560.4638547897339,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "59cc568a.83f018",
+        "73ddfac2.a0d4e4"
+      ]
+    ]
+  },
+  {
+    "id": "59cc568a.83f018",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1380.81734085083,
+    "y": 534.4638872146606,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "e9b5fb34.606db8"
+      ]
+    ]
+  },
+  {
+    "id": "73ddfac2.a0d4e4",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1381.102897644043,
+    "y": 589.4638586044312,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "b0968203.54d37"
+      ]
+    ]
+  },
+  {
+    "id": "fb4eb84c.02a668",
+    "type": "set",
+    "name": "set prop.tenant-id",
+    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n",
+    "comments": "",
+    "x": 1628.5314903259277,
+    "y": 674.6066589355469,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "e9b5fb34.606db8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1520.2812385559082,
+    "y": 534.7851557731628,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "caa8d5b4.0ad2b8",
+        "a7278d93.3720c",
+        "160a6c8c.918963",
+        "da44425a.02876",
+        "416c4dbb.36fe64",
+        "4cac2ec3.0933d",
+        "33b241ad.e4aa3e"
+      ]
+    ]
+  },
+  {
+    "id": "da44425a.02876",
+    "type": "set",
+    "name": "set prop.customer-id",
+    "xml": "<set>\n<parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />\n",
+    "comments": "",
+    "x": 1731.9243469238281,
+    "y": 345.35671615600586,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "caa8d5b4.0ad2b8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1790.9241638183594,
+    "y": 475.9280071258545,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a7278d93.3720c",
+    "type": "set",
+    "name": "set prop.tenant-id",
+    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\n",
+    "comments": "",
+    "x": 1743.7814826965332,
+    "y": 600.7852363586426,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "160a6c8c.918963",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant auth",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1811.281478881836,
+    "y": 636.5352363586426,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "416c4dbb.36fe64",
+    "type": "get-resource",
+    "name": "update-resource customer-id in service-subscription",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />\n<!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1835.2098541259766,
+    "y": 536.9281234741211,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bbcbdc4.862f32",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 986.602653503418,
+    "y": 568.4598321914673,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "b8d38e16.8f50d"
+      ]
+    ]
+  },
+  {
+    "id": "4736bcfb.a0c9e4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 980.2812423706055,
+    "y": 620.6741437911987,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "f07e116f.03b5"
+      ]
+    ]
+  },
+  {
+    "id": "f07e116f.03b5",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 get token rest api\" />\n",
+    "comments": "",
+    "x": 1133.0312423706055,
+    "y": 620.424204826355,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "9cac03d4.f972",
+    "type": "set",
+    "name": "set  vpn-id to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
+    "comments": "",
+    "x": 757.5313262939453,
+    "y": 926.5352201461792,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "b0968203.54d37",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1439.7536544799805,
+    "y": 672.6108503341675,
+    "z": "b086040b.a7e558",
+    "wires": [
+      [
+        "fb4eb84c.02a668",
+        "a2f6331e.2d634"
+      ]
+    ]
+  },
+  {
+    "id": "a2f6331e.2d634",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant auth",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1711.1822509765625,
+    "y": 721.1822528839111,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4cac2ec3.0933d",
+    "type": "set",
+    "name": "set prop.userAccount",
+    "xml": "<set>\n<parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />\n<parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />",
+    "comments": "",
+    "x": 1732.03125,
+    "y": 423.03125190734863,
+    "z": "b086040b.a7e558",
+    "wires": []
+  },
+  {
+    "id": "33b241ad.e4aa3e",
+    "type": "execute",
+    "name": "execute concat customer-id and @test.com",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >\n    <parameter name=\"source\" value='`$prop.customer-id`'/>\n    <parameter name=\"outputPath\" value=\"tmp.userAccountEmail\"/>\n    <parameter name=\"target\" value=\"@test.com\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1807.0351257324219,
+    "y": 387.03519439697266,
+    "z": "b086040b.a7e558",
+    "wires": [
+      []
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index bd24e0f2..6decb2f4 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
@@ -1,2997 +1,3067 @@
-[
-  {
-    "id": "510329fc.5eb288",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 92,
-    "y": 51,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "d0754e51.43601"
-      ]
-    ]
-  },
-  {
-    "id": "d0754e51.43601",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "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}'>",
-    "outputs": 1,
-    "x": 304.00000381469727,
-    "y": 123.0000171661377,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "5324d186.c424e"
-      ]
-    ]
-  },
-  {
-    "id": "5324d186.c424e",
-    "type": "method",
-    "name": "sotn-attachment-topology-operation-activate",
-    "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 292.0001220703125,
-    "y": 211,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "200d23ad.1ba52c"
-      ]
-    ]
-  },
-  {
-    "id": "200d23ad.1ba52c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 308.0001220703125,
-    "y": 766.0002446174622,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "50fa98f0.7c4998",
-        "6f233fc4.4456d",
-        "8ef678b.4678d88",
-        "41e3aa85.858d54",
-        "b2920bb5.1af8e8",
-        "525ecaee.ee9b24",
-        "ab2f4625.6243a8",
-        "b09745d8.bb7668",
-        "b13bf095.cdea1",
-        "dcca5b8a.14d818",
-        "5d5e7f8f.d3d28",
-        "b3a2976e.016ed8",
-        "33c05db5.bb8532",
-        "dde46f65.1623c",
-        "3d236d8e.1a1ed2",
-        "9dd9851c.cc5e08",
-        "21b8bdc2.b30a32",
-        "c4803883.47c5a8",
-        "ad2575da.f719b8",
-        "c4ade364.dff4"
-      ]
-    ]
-  },
-  {
-    "id": "50fa98f0.7c4998",
-    "type": "set",
-    "name": "set tmp.ar.allotted-resource-id,etc",
-    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
-    "comments": "",
-    "x": 704.9935607910156,
-    "y": 164.9934868812561,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "d87c2a28.d4a808",
-    "type": "comment",
-    "name": "set tmp ar-id to fetch resource from MDSAL",
-    "info": "",
-    "comments": "",
-    "x": 733.9538726806641,
-    "y": 129.02528285980225,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "6f233fc4.4456d",
-    "type": "set",
-    "name": "set tmp.ar.self-link",
-    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
-    "comments": "",
-    "x": 658.9934997558594,
-    "y": 257.99349212646484,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b2920bb5.1af8e8",
-    "type": "execute",
-    "name": "execute Properties",
-    "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' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 665.2553901672363,
-    "y": 345.6602210998535,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "8ef678b.4678d88",
-    "type": "execute",
-    "name": "generate allotted-resource tmp.ar-url",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 712.2554473876953,
-    "y": 433.6602249145508,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2c8ad64b.5a9c0a",
-    "type": "comment",
-    "name": "GET connection-attachment-allotted-resource from mdsal",
-    "info": "",
-    "comments": "",
-    "x": 758.8083801269531,
-    "y": 564.5386590957642,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "3f345735.382a78",
-    "type": "comment",
-    "name": "Used for setting output to API Handler",
-    "info": "",
-    "comments": "",
-    "x": 712.9935302734375,
-    "y": 224.993501663208,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "dc7c3756.7911f8",
-    "type": "comment",
-    "name": "Obtain different URL, template location etc",
-    "info": "For saving resource information to MDSAL & for AAI",
-    "comments": "",
-    "x": 730.9934959411621,
-    "y": 310.8823823928833,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "385fcb45.8d58e4",
-    "type": "comment",
-    "name": "Used to Get AR by id to MDSAL, same as self-link",
-    "info": "",
-    "comments": "",
-    "x": 756.9935150146484,
-    "y": 397.8823413848877,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "fb3f3db1.2e857",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1218.6667919158936,
-    "y": 581.9999847412109,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7924d66d.1039e8"
-      ]
-    ]
-  },
-  {
-    "id": "7924d66d.1039e8",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1362.6668701171875,
-    "y": 539.4999027252197,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "2e9884a4.fb6aac"
-      ]
-    ]
-  },
-  {
-    "id": "2e9884a4.fb6aac",
-    "type": "switchNode",
-    "name": "switch cr length",
-    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1531.5242938995361,
-    "y": 537.1190738677979,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "a5020a5a.1a8de8",
-        "a75f121c.781a7"
-      ]
-    ]
-  },
-  {
-    "id": "a5020a5a.1a8de8",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1686.8574295043945,
-    "y": 509.1189889907837,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "dc7b8304.a3929"
-      ]
-    ]
-  },
-  {
-    "id": "dc7b8304.a3929",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1845.381233215332,
-    "y": 507.02383613586426,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "2e53bf10.53616",
-        "4d06247.7481adc",
-        "16d5ef9e.67621"
-      ]
-    ]
-  },
-  {
-    "id": "57e48b3f.e4d594",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n    \n",
-    "comments": "",
-    "x": 1785.5191650390625,
-    "y": 614.0660705566406,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "549a2a73.774b74",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1210.5185947418213,
-    "y": 617.0660696029663,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "13c58b6.0463e75"
-      ]
-    ]
-  },
-  {
-    "id": "13c58b6.0463e75",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1390.5185451507568,
-    "y": 617.7326202392578,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "57e48b3f.e4d594"
-      ]
-    ]
-  },
-  {
-    "id": "a75f121c.781a7",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1678.185432434082,
-    "y": 568.3993635177612,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "57e48b3f.e4d594"
-      ]
-    ]
-  },
-  {
-    "id": "2e53bf10.53616",
-    "type": "set",
-    "name": "set connection-attachment-ar from get",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
-    "comments": "",
-    "x": 2092.4446868896484,
-    "y": 480.00008821487427,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "16d5ef9e.67621",
-    "type": "set",
-    "name": "set oper-status",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
-    "comments": "",
-    "x": 2026.4447174072266,
-    "y": 553.4285907745361,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "4d06247.7481adc",
-    "type": "switchNode",
-    "name": "switch order-status",
-    "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2036.4444961547852,
-    "y": 519.0000247955322,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "13c3c1da.98e52e",
-        "c01b9863.c31138",
-        "bd2b5022.a474e"
-      ]
-    ]
-  },
-  {
-    "id": "13c3c1da.98e52e",
-    "type": "outcome",
-    "name": "outcome Created",
-    "xml": "<outcome value='Created'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2272.044578552246,
-    "y": 513.0000557899475,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "29af8103.34f60e"
-      ]
-    ]
-  },
-  {
-    "id": "c01b9863.c31138",
-    "type": "outcome",
-    "name": "outcome Other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2265.759078979492,
-    "y": 593.4286904335022,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "869d355f.ff5a28"
-      ]
-    ]
-  },
-  {
-    "id": "29af8103.34f60e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2430.515251159668,
-    "y": 513.37571144104,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "869d355f.ff5a28",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
-    "comments": "",
-    "x": 2441.666893005371,
-    "y": 592.0000896453857,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "4c9dfad4.b5cb94",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 929.303050994873,
-    "y": 664.4936046600342,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "525ecaee.ee9b24",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 623.3091506958008,
-    "y": 665.4999752044678,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "4c9dfad4.b5cb94"
-      ]
-    ]
-  },
-  {
-    "id": "f0374b61.7fdcc8",
-    "type": "comment",
-    "name": "GET parent-service-data from mdsal to check existence of other End point",
-    "info": "",
-    "comments": "",
-    "x": 811.00048828125,
-    "y": 710.5317525863647,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ee77ccab.555f2",
-    "type": "for",
-    "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1702.1851959228516,
-    "y": 863.0042300224304,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "1d8e18c9.612a97"
-      ]
-    ]
-  },
-  {
-    "id": "41e3aa85.858d54",
-    "type": "switchNode",
-    "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
-    "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 786.1842193603516,
-    "y": 970.7182664871216,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "227fe562.bef93a",
-        "30f6347f.71f27c",
-        "8d3aa09e.93736"
-      ]
-    ]
-  },
-  {
-    "id": "227fe562.bef93a",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1114.3272399902344,
-    "y": 1043.5755405426025,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "70131877.497ee8"
-      ]
-    ]
-  },
-  {
-    "id": "d8325992.1c7e08",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1298.454502105713,
-    "y": 902.7015495300293,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "ee77ccab.555f2",
-        "7fdc18ff.582858"
-      ]
-    ]
-  },
-  {
-    "id": "1d8e18c9.612a97",
-    "type": "switchNode",
-    "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2142.2965240478516,
-    "y": 860.0040321350098,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "d475cadd.1a2f78",
-        "4ec4a51f.47decc"
-      ]
-    ]
-  },
-  {
-    "id": "d475cadd.1a2f78",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2315.1067390441895,
-    "y": 831.4686470031738,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "4ae70fe8.b24e9"
-      ]
-    ]
-  },
-  {
-    "id": "7b37e59c.23ec7c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2463.8672103881836,
-    "y": 888.3257341384888,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "102e4d37.8fb7c3"
-      ]
-    ]
-  },
-  {
-    "id": "102e4d37.8fb7c3",
-    "type": "set",
-    "name": "set tmp.pidx and ptx.consumed-ar",
-    "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
-    "comments": "",
-    "x": 2698.724636077881,
-    "y": 886.8972663879395,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "82ecf3e0.5c52b",
-    "type": "comment",
-    "name": "Check existence of other AR in parent service data",
-    "info": "Check if other allotted resource is available.",
-    "comments": "",
-    "x": 733.9626579284668,
-    "y": 875.8929615020752,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "30f6347f.71f27c",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1128.9797096252441,
-    "y": 982.6772241592407,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "2cd6df64.b8473"
-      ]
-    ]
-  },
-  {
-    "id": "70131877.497ee8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: End points not available\" />\n    \n",
-    "comments": "",
-    "x": 1273.9795875549316,
-    "y": 1042.67746925354,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "8d3aa09e.93736",
-    "type": "other",
-    "name": "outcome 2",
-    "xml": "<outcome value='2'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1123.9795227050781,
-    "y": 903.6772499084473,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "d8325992.1c7e08"
-      ]
-    ]
-  },
-  {
-    "id": "4ae70fe8.b24e9",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2473.0909538269043,
-    "y": 830.6773900985718,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4ec4a51f.47decc",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2322.0905952453613,
-    "y": 887.6772499084473,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7b37e59c.23ec7c"
-      ]
-    ]
-  },
-  {
-    "id": "7fdc18ff.582858",
-    "type": "switchNode",
-    "name": "switch tmp.found-in-ar",
-    "xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1510.9794998168945,
-    "y": 956.4550676345825,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "92b2633f.8d761"
-      ]
-    ]
-  },
-  {
-    "id": "92b2633f.8d761",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1681.97953414917,
-    "y": 957.5662889480591,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "c3df20e.333b9e"
-      ]
-    ]
-  },
-  {
-    "id": "c3df20e.333b9e",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1830.9796295166016,
-    "y": 957.5662879943848,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "8c502b5e.ba0e48",
-        "b7c302f0.0eaa4"
-      ]
-    ]
-  },
-  {
-    "id": "642168d6.c96a08",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2577.097454071045,
-    "y": 973.7951421737671,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "28182687.5e2d2a"
-      ]
-    ]
-  },
-  {
-    "id": "d6797517.070b08",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2568.9492568969727,
-    "y": 1008.8612270355225,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "863cf5ba.41a538"
-      ]
-    ]
-  },
-  {
-    "id": "5a7b91f3.92074",
-    "type": "switchNode",
-    "name": "switch mdsal-psd.service-data.networks_length",
-    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1574.313003540039,
-    "y": 1057.899908065796,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "5c7b0dd2.1db974",
-        "decd8771.495088"
-      ]
-    ]
-  },
-  {
-    "id": "decd8771.495088",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1838.3128509521484,
-    "y": 1037.7886543273926,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "26e27dfe.c23ed2"
-      ]
-    ]
-  },
-  {
-    "id": "5c7b0dd2.1db974",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1828.3129119873047,
-    "y": 1085.788625717163,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "2701bab7.b74336"
-      ]
-    ]
-  },
-  {
-    "id": "2701bab7.b74336",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
-    "comments": "",
-    "x": 1966.9652557373047,
-    "y": 1087.890386581421,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "3f964f3.96aa1b",
-    "type": "set",
-    "name": "set tmp.network.",
-    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n",
-    "comments": "",
-    "x": 2199.757709503174,
-    "y": 1038.788824081421,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "2cd6df64.b8473",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1296.4240188598633,
-    "y": 981.7884912490845,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "5a7b91f3.92074"
-      ]
-    ]
-  },
-  {
-    "id": "26e27dfe.c23ed2",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1997.0906219482422,
-    "y": 1040.7884883880615,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "3f964f3.96aa1b",
-        "d34f3159.b7d95"
-      ]
-    ]
-  },
-  {
-    "id": "d34f3159.b7d95",
-    "type": "for",
-    "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
-    "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 2360.090660095215,
-    "y": 1086.7886428833008,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "6c6f677c.4a6ae8"
-      ]
-    ]
-  },
-  {
-    "id": "6c6f677c.4a6ae8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2406.646728515625,
-    "y": 1317.7884521484375,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "5a5ff171.f67b5",
-        "5ac44b36.e6ed64",
-        "477598ab.94c4f8",
-        "bf3fd182.60613",
-        "ee0ac40b.7c8918",
-        "334ef95a.804996",
-        "6b4b64b0.8aa49c",
-        "f2f619ae.81dc88",
-        "7f22248e.623acc",
-        "1977cf51.112051"
-      ]
-    ]
-  },
-  {
-    "id": "5a5ff171.f67b5",
-    "type": "switchNode",
-    "name": "switch access-node-id",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 2683.1569442749023,
-    "y": 1159.7991995811462,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "83c25cc5.35c9d"
-      ]
-    ]
-  },
-  {
-    "id": "83c25cc5.35c9d",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2872.1565704345703,
-    "y": 1161.7990641593933,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "80bf2f28.f9eae"
-      ]
-    ]
-  },
-  {
-    "id": "80bf2f28.f9eae",
-    "type": "set",
-    "name": "set tmp.found-in-network tmp.ep-available",
-    "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
-    "comments": "",
-    "x": 3125.1567459106445,
-    "y": 1161.3991103172302,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "5ac44b36.e6ed64",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 2657.146396636963,
-    "y": 1533.7884907722473,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b3a2976e.016ed8",
-    "type": "switchNode",
-    "name": "switch tmp.ep-available",
-    "xml": "<switch test='`$tmp.ep-available`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 649.3128204345703,
-    "y": 1166.232801437378,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "d67d36b.8c807c8",
-        "d4dded0c.3defe"
-      ]
-    ]
-  },
-  {
-    "id": "d4dded0c.3defe",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 867.9795398712158,
-    "y": 1215.5661582946777,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "dac36818.3ade18"
-      ]
-    ]
-  },
-  {
-    "id": "d67d36b.8c807c8",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 872.8683414459229,
-    "y": 1124.566219329834,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "fea8c889.837c28"
-      ]
-    ]
-  },
-  {
-    "id": "fea8c889.837c28",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1019.8683376312256,
-    "y": 1126.4550323486328,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "dac36818.3ade18",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1038.090627670288,
-    "y": 1213.5661163330078,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "47a53791.ce00e8",
-        "49abb372.8700ac",
-        "73f1353a.31fe0c"
-      ]
-    ]
-  },
-  {
-    "id": "47a53791.ce00e8",
-    "type": "switchNode",
-    "name": "switch tmp.found-in-ar",
-    "xml": "<switch test='`$tmp.found-in-ar`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1264.2016410827637,
-    "y": 1180.5661163330078,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "f3f2f58d.f1fde8",
-        "73ae144b.6c716c"
-      ]
-    ]
-  },
-  {
-    "id": "f3f2f58d.f1fde8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1459.6460876464844,
-    "y": 1158.566177368164,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "a49cc189.c10f7"
-      ]
-    ]
-  },
-  {
-    "id": "73ae144b.6c716c",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1456.64599609375,
-    "y": 1206.566162109375,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "5c6b8964.10acc8"
-      ]
-    ]
-  },
-  {
-    "id": "a49cc189.c10f7",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1647.2017517089844,
-    "y": 1155.566177368164,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "50540586.cfd78c"
-      ]
-    ]
-  },
-  {
-    "id": "5c6b8964.10acc8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1644.20166015625,
-    "y": 1205.566162109375,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7849a3ee.c57b4c"
-      ]
-    ]
-  },
-  {
-    "id": "b9bd1802.9893c8",
-    "type": "comment",
-    "name": "GET connection-attachment-ar to store AR data from mdsal",
-    "info": "",
-    "comments": "",
-    "x": 2156.4728355407715,
-    "y": 442.50394773483276,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "811f13c4.a802b",
-    "type": "comment",
-    "name": "Set source end point",
-    "info": "",
-    "comments": "",
-    "x": 645.9727325439453,
-    "y": 531.2539677619934,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ab2f4625.6243a8",
-    "type": "set",
-    "name": "set tmp.ar.parent-service-instance-id",
-    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
-    "comments": "",
-    "x": 696.9688262939453,
-    "y": 740.0000905990601,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "e3a34e44.03f86",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1056.968978881836,
-    "y": 811.0000772476196,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "1cfd4bb9.99d9a4"
-      ]
-    ]
-  },
-  {
-    "id": "8447b050.f664b",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1048.8207817077637,
-    "y": 846.066162109375,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7bd6123e.8e599c"
-      ]
-    ]
-  },
-  {
-    "id": "7bd6123e.8e599c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
-    "comments": "",
-    "x": 1194.9695625305176,
-    "y": 845.3335733413696,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "1cfd4bb9.99d9a4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1187.9690742492676,
-    "y": 811.0001382827759,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "863cf5ba.41a538",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN provided attachment resource not found\" />\n    \n",
-    "comments": "",
-    "x": 2718.969306945801,
-    "y": 1009.00026512146,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "28182687.5e2d2a",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2703.9694290161133,
-    "y": 976.0002498626709,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b09745d8.bb7668",
-    "type": "set",
-    "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
-    "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
-    "comments": "",
-    "x": 782.9687652587891,
-    "y": 913.0000648498535,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "53f5b769.1d9ac8",
-    "type": "comment",
-    "name": "If other EP exists set destination end point",
-    "info": "Check if other allotted resource is available.",
-    "comments": "",
-    "x": 699.9687652587891,
-    "y": 1091.0000133514404,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "39192112.9a7a9e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1439.9688873291016,
-    "y": 1418.0002946853638,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "29497381.2907dc",
-        "a8454134.72dfa",
-        "b437b233.85dc6",
-        "d5da4e92.fd9d5",
-        "527cda61.4c5444",
-        "21b345b.f16dcba",
-        "847549d0.8fada8",
-        "46d04af2.172014"
-      ]
-    ]
-  },
-  {
-    "id": "29497381.2907dc",
-    "type": "switchNode",
-    "name": "switch access-node-id",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1682.4791889190674,
-    "y": 1288.010691165924,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "b53954e3.75f548"
-      ]
-    ]
-  },
-  {
-    "id": "a8454134.72dfa",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 1655.4691410064697,
-    "y": 1593.0006546974182,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b437b233.85dc6",
-    "type": "switchNode",
-    "name": "switch access-ltp-id",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1673.9690189361572,
-    "y": 1331.7782225608826,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "4beb5c8f.437a34"
-      ]
-    ]
-  },
-  {
-    "id": "d5da4e92.fd9d5",
-    "type": "switchNode",
-    "name": "switch clientSignal",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1667.9690570831299,
-    "y": 1377.778269290924,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "a652bfee.a4a86"
-      ]
-    ]
-  },
-  {
-    "id": "527cda61.4c5444",
-    "type": "switchNode",
-    "name": "switch cVLAN",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1651.9585590362549,
-    "y": 1416.767771244049,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "b6d9ed74.687c9"
-      ]
-    ]
-  },
-  {
-    "id": "b53954e3.75f548",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1860.1911029815674,
-    "y": 1288.6670632362366,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "b7855c9c.e078"
-      ]
-    ]
-  },
-  {
-    "id": "b7855c9c.e078",
-    "type": "set",
-    "name": "set dst-access-node-id",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
-    "comments": "",
-    "x": 2035.1911029815674,
-    "y": 1288.267038345337,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "4beb5c8f.437a34",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1855.6809711456299,
-    "y": 1331.434519290924,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "17f7ba24.7fa566"
-      ]
-    ]
-  },
-  {
-    "id": "a652bfee.a4a86",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1855.6809711456299,
-    "y": 1377.434519290924,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "b4e0c929.110668"
-      ]
-    ]
-  },
-  {
-    "id": "b6d9ed74.687c9",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1855.6704730987549,
-    "y": 1416.4241433143616,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "90d8491c.861238"
-      ]
-    ]
-  },
-  {
-    "id": "49abb372.8700ac",
-    "type": "for",
-    "name": "for idx..tmp.ep.parameters[]",
-    "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1292.96875,
-    "y": 1306,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "39192112.9a7a9e"
-      ]
-    ]
-  },
-  {
-    "id": "50540586.cfd78c",
-    "type": "set",
-    "name": "set tmp.ep.parameters",
-    "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />\n",
-    "comments": "",
-    "x": 1858.9688053131104,
-    "y": 1155.0000743865967,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "7849a3ee.c57b4c",
-    "type": "set",
-    "name": "set tmp.ep.parameters",
-    "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n",
-    "comments": "",
-    "x": 1855.968713760376,
-    "y": 1201.0000591278076,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "17f7ba24.7fa566",
-    "type": "set",
-    "name": "set dst-access-node-id",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
-    "comments": "",
-    "x": 2032.9689350128174,
-    "y": 1331.0003151893616,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b4e0c929.110668",
-    "type": "set",
-    "name": "set dst-clientSignal",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />",
-    "comments": "",
-    "x": 2026.9689350128174,
-    "y": 1375.0003151893616,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "90d8491c.861238",
-    "type": "set",
-    "name": "set dst-cVLAN",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />",
-    "comments": "",
-    "x": 2017.9689350128174,
-    "y": 1414.0003151893616,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "7a6bd4c0.0a23ac",
-    "type": "comment",
-    "name": "Get controller info and send request",
-    "info": "",
-    "comments": "",
-    "x": 1899.968807220459,
-    "y": 1885.000153541565,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "e5ca51fb.cb5be",
-    "type": "execute",
-    "name": "execute RestApiCallNode Create ethernet Service",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1963.9693450927734,
-    "y": 2159.001121520996,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "4fd581be.ae7c5",
-        "cba0e7bf.640378"
-      ]
-    ]
-  },
-  {
-    "id": "4fd581be.ae7c5",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2229.9690704345703,
-    "y": 2188.001244544983,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "9a1df066.c1be9"
-      ]
-    ]
-  },
-  {
-    "id": "9a1df066.c1be9",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2377.9690704345703,
-    "y": 2186.0011224746704,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "434af439.625b6c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
-    "comments": "",
-    "x": 2359.9691009521484,
-    "y": 2133.0011825561523,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "cba0e7bf.640378",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2220.969009399414,
-    "y": 2133.0011825561523,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "434af439.625b6c"
-      ]
-    ]
-  },
-  {
-    "id": "1a8278df.ac4137",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 871.7311744689941,
-    "y": 2108.9537086486816,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "c4aa74e4.35ca78"
-      ]
-    ]
-  },
-  {
-    "id": "c4aa74e4.35ca78",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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=\"AAI failed\" />\n",
-    "comments": "",
-    "x": 1038.2549953460693,
-    "y": 2135.5727157592773,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "33c28cf6.2b21a4",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 873.8264026641846,
-    "y": 2156.715551376343,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "c4aa74e4.35ca78"
-      ]
-    ]
-  },
-  {
-    "id": "cb1a048d.e95fc8",
-    "type": "comment",
-    "name": "Save Resource to AAI",
-    "info": "",
-    "comments": "",
-    "x": 645.7788181304932,
-    "y": 2097.3028717041016,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "c4803883.47c5a8",
-    "type": "set",
-    "name": "set output to api handler",
-    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
-    "comments": "",
-    "x": 660.5465145111084,
-    "y": 2018.8283529281616,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "c4ade364.dff4",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 620.9596862792969,
-    "y": 2204.4441413879395,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "21b8bdc2.b30a32",
-    "type": "execute",
-    "name": "execute RestApiCallNode - PUT AR by id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 713.2785968780518,
-    "y": 1943.4692058563232,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "72334169.43788",
-        "91c81d87.0f2e3",
-        "4377487a.aa9b58"
-      ]
-    ]
-  },
-  {
-    "id": "72334169.43788",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 967.9200191497803,
-    "y": 1987.8006000518799,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "3aa37f14.b2a12"
-      ]
-    ]
-  },
-  {
-    "id": "91c81d87.0f2e3",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 969.9200420379639,
-    "y": 1946.3005641922355,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "3aa37f14.b2a12"
-      ]
-    ]
-  },
-  {
-    "id": "4377487a.aa9b58",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 973.6701259613037,
-    "y": 1897.6577167510986,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "ce3cc849.21f268"
-      ]
-    ]
-  },
-  {
-    "id": "3aa37f14.b2a12",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
-    "comments": "",
-    "x": 1128.67014503479,
-    "y": 1966.050630569458,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ce3cc849.21f268",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1101.3260707855225,
-    "y": 1899.8498849868774,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "33c05db5.bb8532",
-    "type": "set",
-    "name": "set ar-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
-    "comments": "",
-    "x": 615.4922122955322,
-    "y": 1777.8501069545746,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "3d236d8e.1a1ed2",
-    "type": "execute",
-    "name": "execute getTime",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 632.77805519104,
-    "y": 1850.4697046279907,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9dd9851c.cc5e08",
-    "type": "set",
-    "name": "set allotted-resource-oper-status",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
-    "comments": "",
-    "x": 682.7651348114014,
-    "y": 1887.4207849502563,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "dde46f65.1623c",
-    "type": "set",
-    "name": "set model-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
-    "comments": "",
-    "x": 629.3337535858154,
-    "y": 1817.024757385254,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "c0243700.483a78",
-    "type": "comment",
-    "name": "Prepare data for allotted-resource addition to MDSAL",
-    "info": "This will add to allotted-resource which is present inside service.",
-    "comments": "",
-    "x": 742.66721534729,
-    "y": 1738.0247094631195,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b128777a.bf8ad8",
-    "type": "comment",
-    "name": "Add to allotted-resources in mdsal",
-    "info": "",
-    "comments": "",
-    "x": 684.2470417022705,
-    "y": 1705.4380111694336,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ad2575da.f719b8",
-    "type": "update",
-    "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 672.2230968475342,
-    "y": 2134.7550144195557,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "1a8278df.ac4137",
-        "33c28cf6.2b21a4"
-      ]
-    ]
-  },
-  {
-    "id": "73456eef.45eac",
-    "type": "execute",
-    "name": "execute RestApiCallNode getPath from OOF",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"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`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1480.973056793213,
-    "y": 1697.2546663284302,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "473a6700.6236e8",
-        "5286278b.3b3cd8"
-      ]
-    ]
-  },
-  {
-    "id": "473a6700.6236e8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1720.9731979370117,
-    "y": 1721.254635810852,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "cafce3b5.74fb5"
-      ]
-    ]
-  },
-  {
-    "id": "dc79f611.cf4238",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 OOF api\" />\n",
-    "comments": "",
-    "x": 1859.973232269287,
-    "y": 1670.2547273635864,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "5286278b.3b3cd8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1719.9729843139648,
-    "y": 1670.254726409912,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "dc79f611.cf4238"
-      ]
-    ]
-  },
-  {
-    "id": "deb094f6.e597f8",
-    "type": "comment",
-    "name": "Get VPNs from OOF",
-    "info": "",
-    "comments": "",
-    "x": 1466.976978302002,
-    "y": 1664.2586660385132,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "da1582e5.d9e86",
-    "type": "for",
-    "name": "for vidx..oof.vpns_length[]",
-    "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 1420.972900390625,
-    "y": 1779.50439453125,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "b2ef8ded.b479a"
-      ]
-    ]
-  },
-  {
-    "id": "c9df49cc.0e8008",
-    "type": "comment",
-    "name": "Loop through VPN and configure them",
-    "info": "",
-    "comments": "",
-    "x": 1466.9733505249023,
-    "y": 1914.0047721862793,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "477598ab.94c4f8",
-    "type": "switchNode",
-    "name": "switch name",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n                \n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2660.757080078125,
-    "y": 1251.121826171875,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7c0be7f6.9e8c58"
-      ]
-    ]
-  },
-  {
-    "id": "7c0be7f6.9e8c58",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2849.757049560547,
-    "y": 1251.121811389923,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "1cf5a70.cc26659"
-      ]
-    ]
-  },
-  {
-    "id": "1cf5a70.cc26659",
-    "type": "set",
-    "name": "set etht-svc-name & bandwidth-profile-name",
-    "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 3090.75736618042,
-    "y": 1250.7218661308289,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "bf3fd182.60613",
-    "type": "switchNode",
-    "name": "switch description",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2673.5969581604004,
-    "y": 1286.1219210624695,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "f2fb468e.d467f8"
-      ]
-    ]
-  },
-  {
-    "id": "f2fb468e.d467f8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2848.597023010254,
-    "y": 1288.1219067573547,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "e7ce8468.64c938"
-      ]
-    ]
-  },
-  {
-    "id": "e7ce8468.64c938",
-    "type": "set",
-    "name": "set etht-svc-descr",
-    "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 3004.9303398132324,
-    "y": 1285.5829815864563,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ee0ac40b.7c8918",
-    "type": "switchNode",
-    "name": "switch tenantId",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2668.979221343994,
-    "y": 1319.4553112983704,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "db11a89d.57ead8"
-      ]
-    ]
-  },
-  {
-    "id": "db11a89d.57ead8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2846.9792251586914,
-    "y": 1323.4551892280579,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "a28b1daa.bce21"
-      ]
-    ]
-  },
-  {
-    "id": "a28b1daa.bce21",
-    "type": "set",
-    "name": "set tenantId",
-    "xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2984.9794120788574,
-    "y": 1320.0551648139954,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "6b4b64b0.8aa49c",
-    "type": "switchNode",
-    "name": "switch cir",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2651.818820953369,
-    "y": 1392.4552664756775,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "779ba6d5.68a5b8"
-      ]
-    ]
-  },
-  {
-    "id": "779ba6d5.68a5b8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2846.8188858032227,
-    "y": 1393.4552664756775,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "51c8d37d.57c57c"
-      ]
-    ]
-  },
-  {
-    "id": "51c8d37d.57c57c",
-    "type": "set",
-    "name": "set cir",
-    "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2971.15238571167,
-    "y": 1391.916341304779,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "334ef95a.804996",
-    "type": "switchNode",
-    "name": "switch vpnType",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2666.127109527588,
-    "y": 1355.232976436615,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "edf65e2e.17eef"
-      ]
-    ]
-  },
-  {
-    "id": "edf65e2e.17eef",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2848.127296447754,
-    "y": 1358.232961177826,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "3a58a10e.af006e"
-      ]
-    ]
-  },
-  {
-    "id": "3a58a10e.af006e",
-    "type": "set",
-    "name": "set vpnType",
-    "xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2984.461040496826,
-    "y": 1354.6942028999329,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "f2f619ae.81dc88",
-    "type": "switchNode",
-    "name": "switch eir",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2647.1091651916504,
-    "y": 1426.1531739234924,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "290775a.582758a"
-      ]
-    ]
-  },
-  {
-    "id": "290775a.582758a",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2847.1094131469727,
-    "y": 1429.1531128883362,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "be16065f.3cc068"
-      ]
-    ]
-  },
-  {
-    "id": "be16065f.3cc068",
-    "type": "set",
-    "name": "set eir",
-    "xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2970.4430351257324,
-    "y": 1428.6141724586487,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "7f22248e.623acc",
-    "type": "switchNode",
-    "name": "switch colorAware",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2672.109775543213,
-    "y": 1460.1530528068542,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "60b638c9.9f5cf8"
-      ]
-    ]
-  },
-  {
-    "id": "60b638c9.9f5cf8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2843.1095962524414,
-    "y": 1466.1529912948608,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "6283050a.9a352c"
-      ]
-    ]
-  },
-  {
-    "id": "6283050a.9a352c",
-    "type": "set",
-    "name": "set colorAware",
-    "xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2991.44291305542,
-    "y": 1466.6142039299011,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "1977cf51.112051",
-    "type": "switchNode",
-    "name": "switch couplingFlag",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2674.1097145080566,
-    "y": 1496.1531147956848,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "95d93fbe.f7437"
-      ]
-    ]
-  },
-  {
-    "id": "95d93fbe.f7437",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2846.1095962524414,
-    "y": 1505.1530842781067,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "ceecc29f.0a56b"
-      ]
-    ]
-  },
-  {
-    "id": "ceecc29f.0a56b",
-    "type": "set",
-    "name": "set couplingFlag",
-    "xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
-    "comments": "",
-    "x": 2999.44291305542,
-    "y": 1505.6142048835754,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b4b830f7.2edfb",
-    "type": "comment",
-    "name": "Check if other EP exists in SOTNConnectionResource",
-    "info": "",
-    "comments": "",
-    "x": 2805.312744140625,
-    "y": 1114.7884521484375,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "85af2b8.2c027d8",
-    "type": "comment",
-    "name": "Get other global parameters from network",
-    "info": "",
-    "comments": "",
-    "x": 2741.3125,
-    "y": 1200.7884521484375,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "21b345b.f16dcba",
-    "type": "switchNode",
-    "name": "switch access-provider-id",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1689.5348529815674,
-    "y": 1462.2329812049866,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "88d75ee0.36aab"
-      ]
-    ]
-  },
-  {
-    "id": "88d75ee0.36aab",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1876.5348529815674,
-    "y": 1458.2329812049866,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "144324cd.dbe03b"
-      ]
-    ]
-  },
-  {
-    "id": "144324cd.dbe03b",
-    "type": "set",
-    "name": "set access-provider-id",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 2044.5348529815674,
-    "y": 1458.8329873085022,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "847549d0.8fada8",
-    "type": "switchNode",
-    "name": "switch access-client-id",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1680.5348682403564,
-    "y": 1505.2434296607971,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "429ac662.d36c08"
-      ]
-    ]
-  },
-  {
-    "id": "429ac662.d36c08",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1867.5348682403564,
-    "y": 1501.2434296607971,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "fdfea883.43ef38"
-      ]
-    ]
-  },
-  {
-    "id": "fdfea883.43ef38",
-    "type": "set",
-    "name": "set access-client-id",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 2035.5348682403564,
-    "y": 1501.8434357643127,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "46d04af2.172014",
-    "type": "switchNode",
-    "name": "switch access-topology-id",
-    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 1693.534812927246,
-    "y": 1547.2434606552124,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "f9888c9d.14fbf"
-      ]
-    ]
-  },
-  {
-    "id": "f9888c9d.14fbf",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1880.534812927246,
-    "y": 1543.2434606552124,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "9db1bbe8.d24ee8"
-      ]
-    ]
-  },
-  {
-    "id": "9db1bbe8.d24ee8",
-    "type": "set",
-    "name": "set access-topology-id",
-    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 2048.534812927246,
-    "y": 1543.843466758728,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "b2ef8ded.b479a",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1644.090217590332,
-    "y": 1816.3444538116455,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "ca8a96be.c9e6a8",
-        "f4e8e4f3.f6e418",
-        "dea701ef.7abc9",
-        "644c2300.fecafc",
-        "8bddc111.2e08f",
-        "981ad4ae.e983a8",
-        "55066de5.c71104",
-        "3af624e0.31f91c",
-        "e5ca51fb.cb5be",
-        "2e8e574c.c64e68",
-        "b731c6a4.c3a218"
-      ]
-    ]
-  },
-  {
-    "id": "9f0b7f15.8c307",
-    "type": "set",
-    "name": "set controller data",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
-    "comments": "",
-    "x": 2285.534881591797,
-    "y": 1880.6776461601257,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "3af624e0.31f91c",
-    "type": "get-resource",
-    "name": "get-resource esr-thirdparty-sdnc",
-    "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1902.0347900390625,
-    "y": 1917.6775856018066,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "72570e2d.a62fe",
-        "c43ec6a3.683488",
-        "fb06874f.97c548"
-      ]
-    ]
-  },
-  {
-    "id": "72570e2d.a62fe",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2122.034725189209,
-    "y": 1881.6775546073914,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "9f0b7f15.8c307"
-      ]
-    ]
-  },
-  {
-    "id": "c43ec6a3.683488",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2131.525665283203,
-    "y": 1922.2515606880188,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "c36ea2d9.d18c4"
-      ]
-    ]
-  },
-  {
-    "id": "fb06874f.97c548",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2126.858642578125,
-    "y": 1958.5848736763,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "668b481.e36d4b8"
-      ]
-    ]
-  },
-  {
-    "id": "c36ea2d9.d18c4",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 2278.0970153808594,
-    "y": 1918.5373873710632,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "668b481.e36d4b8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 2281.6312866210938,
-    "y": 1960.0240216255188,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "55066de5.c71104",
-    "type": "get-resource",
-    "name": "get-resource pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1847.534683227539,
-    "y": 1826.6772294044495,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "84c5aa59.ee67d8",
-        "41b15be2.0ba8d4",
-        "f1b5d69a.0d7998"
-      ]
-    ]
-  },
-  {
-    "id": "84c5aa59.ee67d8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2029.5347290039062,
-    "y": 1771.677339553833,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "7e1d241.12440dc"
-      ]
-    ]
-  },
-  {
-    "id": "41b15be2.0ba8d4",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2030.0256309509277,
-    "y": 1809.2514362335205,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "e55b495c.733518"
-      ]
-    ]
-  },
-  {
-    "id": "f1b5d69a.0d7998",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2021.358642578125,
-    "y": 1842.5848112106323,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "4d6a36cc.899768"
-      ]
-    ]
-  },
-  {
-    "id": "e55b495c.733518",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2177.597255706787,
-    "y": 1808.5373249053955,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "4d6a36cc.899768",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2175.1312866210938,
-    "y": 1842.023959159851,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "7e1d241.12440dc",
-    "type": "set",
-    "name": "set tmp.thirdparty-sdnc-id",
-    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2214.5347290039062,
-    "y": 1770.6774616241455,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "9df363c3.42e7",
-    "type": "comment",
-    "name": "get domain controller information",
-    "info": "",
-    "comments": "",
-    "x": 1898.0385971069336,
-    "y": 1793.6811847686768,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "2e8e574c.c64e68",
-    "type": "set",
-    "name": "set oof.vpn",
-    "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
-    "comments": "",
-    "x": 1859.534683227539,
-    "y": 1747.7883129119873,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "f4e8e4f3.f6e418",
-    "type": "save",
-    "name": "save VPN resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1874.0001602172852,
-    "y": 2324.7506742477417,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "dea701ef.7abc9",
-    "type": "set",
-    "name": "set tmp.vpnName",
-    "xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />",
-    "comments": "",
-    "x": 1850.5001602172852,
-    "y": 2277.250370979309,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "644c2300.fecafc",
-    "type": "save",
-    "name": "save connectivity relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1909.0001602172852,
-    "y": 2369.7504301071167,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ce418ee5.81a4e",
-    "type": "comment",
-    "name": "save vpn and its relation to AAI",
-    "info": "",
-    "comments": "",
-    "x": 1892.000358581543,
-    "y": 2238.7506399154663,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "ca8a96be.c9e6a8",
-    "type": "set",
-    "name": "set src-ltpId dst-ltpId",
-    "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
-    "comments": "",
-    "x": 1861.0001907348633,
-    "y": 2409.7505502700806,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "8bddc111.2e08f",
-    "type": "save",
-    "name": "save srcLTP relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1895.0004425048828,
-    "y": 2449.500759124756,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "981ad4ae.e983a8",
-    "type": "save",
-    "name": "save dstLTP relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1893.0002746582031,
-    "y": 2495.2505979537964,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b13bf095.cdea1",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 839.0039367675781,
-    "y": 600.0039119720459,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "fb3f3db1.2e857",
-        "549a2a73.774b74"
-      ]
-    ]
-  },
-  {
-    "id": "dcca5b8a.14d818",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource parent service data",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 766.0040893554688,
-    "y": 827.004075050354,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "e3a34e44.03f86",
-        "8447b050.f664b"
-      ]
-    ]
-  },
-  {
-    "id": "5d5e7f8f.d3d28",
-    "type": "execute",
-    "name": "get parent-service-data url",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 666.0039978027344,
-    "y": 790.0039081573486,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "8c502b5e.ba0e48",
-    "type": "execute",
-    "name": "generate tmp.ar-other-url-connection",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-other-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.provided-ar.allotted-resource-id`\"/>\n    \n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2080.0003509521484,
-    "y": 946.3334693908691,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b7c302f0.0eaa4",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-other-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2217.000991821289,
-    "y": 988.8333339691162,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "642168d6.c96a08",
-        "d6797517.070b08"
-      ]
-    ]
-  },
-  {
-    "id": "cafce3b5.74fb5",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1842.0002708435059,
-    "y": 1712.0001192092896,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "73f1353a.31fe0c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1218.9688835144043,
-    "y": 1737.0003032684326,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "73456eef.45eac",
-        "da1582e5.d9e86"
-      ]
-    ]
-  },
-  {
-    "id": "bd2b5022.a474e",
-    "type": "outcome",
-    "name": "outcome PendingDelete",
-    "xml": "<outcome value='PendingDelete'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2293.0313415527344,
-    "y": 552.0312976837158,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "44575632.3edd28"
-      ]
-    ]
-  },
-  {
-    "id": "44575632.3edd28",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2477.031352996826,
-    "y": 548.0312976837158,
-    "z": "f24fb736.66a428",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b731c6a4.c3a218",
-    "type": "execute",
-    "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1922.5039367675781,
-    "y": 2044.003927230835,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "ce234ab1.289298",
-        "b6c8858.bd95c78"
-      ]
-    ]
-  },
-  {
-    "id": "ce234ab1.289298",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2157.503936767578,
-    "y": 2022.003927230835,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "98d09cc3.1216f"
-      ]
-    ]
-  },
-  {
-    "id": "b6c8858.bd95c78",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2149.753936767578,
-    "y": 2075.646810531616,
-    "z": "f24fb736.66a428",
-    "wires": [
-      [
-        "82c72a3.d7e47d8"
-      ]
-    ]
-  },
-  {
-    "id": "82c72a3.d7e47d8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 2302.503936767578,
-    "y": 2075.3968715667725,
-    "z": "f24fb736.66a428",
-    "wires": []
-  },
-  {
-    "id": "98d09cc3.1216f",
-    "type": "set",
-    "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
-    "comments": "",
-    "x": 2311.503936767578,
-    "y": 2023.003927230835,
-    "z": "f24fb736.66a428",
-    "wires": []
-  }
-]
+[
+  {
+    "id": "8d664378.cbb4f",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 118.03125,
+    "y": 76.99999761581421,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "99e747dc.b38c98"
+      ]
+    ]
+  },
+  {
+    "id": "99e747dc.b38c98",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 330.03125381469727,
+    "y": 149.0000147819519,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "677572d7.6cd7ac"
+      ]
+    ]
+  },
+  {
+    "id": "677572d7.6cd7ac",
+    "type": "method",
+    "name": "sotn-attachment-topology-operation-activate",
+    "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 318.0313720703125,
+    "y": 236.9999976158142,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "10091edb.6afce1"
+      ]
+    ]
+  },
+  {
+    "id": "10091edb.6afce1",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 334.0313720703125,
+    "y": 792.0002422332764,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "d8983068.d1e09",
+        "b09c24ef.ef1828",
+        "ab6f9b8e.89d568",
+        "2e23abdc.47fd94",
+        "9144dc70.a7ea8",
+        "4e152126.794ef",
+        "f5e8e1c8.46298",
+        "e64a37c7.f66948",
+        "c941958.f53f068",
+        "4e69710c.777f7",
+        "7b1a01af.62e07",
+        "8f0a4580.6d9e98",
+        "e420c4c5.b6aac8",
+        "9257aeaa.1b50e",
+        "31063248.d169de",
+        "f27d2f2b.5f557",
+        "e5693b1c.1aac88",
+        "625b8a7b.c27e14",
+        "8bb4a5cf.68ff78",
+        "b625537f.a1fdd"
+      ]
+    ]
+  },
+  {
+    "id": "d8983068.d1e09",
+    "type": "set",
+    "name": "set tmp.ar.allotted-resource-id,etc",
+    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
+    "comments": "",
+    "x": 731.0248107910156,
+    "y": 190.9934844970703,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5f587b8.9c56784",
+    "type": "comment",
+    "name": "set tmp ar-id to fetch resource from MDSAL",
+    "info": "",
+    "comments": "",
+    "x": 759.9851226806641,
+    "y": 155.02528047561646,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "b09c24ef.ef1828",
+    "type": "set",
+    "name": "set tmp.ar.self-link",
+    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
+    "comments": "",
+    "x": 685.0247497558594,
+    "y": 283.99348974227905,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9144dc70.a7ea8",
+    "type": "execute",
+    "name": "execute Properties",
+    "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' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 691.2866401672363,
+    "y": 371.6602187156677,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ab6f9b8e.89d568",
+    "type": "execute",
+    "name": "generate allotted-resource tmp.ar-url",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 738.2866973876953,
+    "y": 459.660222530365,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bdc75564.630b58",
+    "type": "comment",
+    "name": "GET connection-attachment-allotted-resource from mdsal",
+    "info": "",
+    "comments": "",
+    "x": 784.8396301269531,
+    "y": 590.5386567115784,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "79296d26.4fef24",
+    "type": "comment",
+    "name": "Used for setting output to API Handler",
+    "info": "",
+    "comments": "",
+    "x": 739.0247802734375,
+    "y": 250.99349927902222,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "b691a7f5.2ca838",
+    "type": "comment",
+    "name": "Obtain different URL, template location etc",
+    "info": "For saving resource information to MDSAL & for AAI",
+    "comments": "",
+    "x": 757.0247459411621,
+    "y": 336.8823800086975,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "ea7f6398.951af",
+    "type": "comment",
+    "name": "Used to Get AR by id to MDSAL, same as self-link",
+    "info": "",
+    "comments": "",
+    "x": 783.0247650146484,
+    "y": 423.8823390007019,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "bf04a12d.5ab3a",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1244.6980419158936,
+    "y": 607.9999823570251,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e36a35e0.a85518"
+      ]
+    ]
+  },
+  {
+    "id": "e36a35e0.a85518",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1388.6981201171875,
+    "y": 565.4999003410339,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "1bc51818.822678"
+      ]
+    ]
+  },
+  {
+    "id": "1bc51818.822678",
+    "type": "switchNode",
+    "name": "switch cr length",
+    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1557.5555438995361,
+    "y": 563.1190714836121,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "c5872f2b.0b178",
+        "aded6823.7e7e38"
+      ]
+    ]
+  },
+  {
+    "id": "c5872f2b.0b178",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1712.8886795043945,
+    "y": 535.1189866065979,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "79a53162.640b2"
+      ]
+    ]
+  },
+  {
+    "id": "79a53162.640b2",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic='true'>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1871.412483215332,
+    "y": 533.0238337516785,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9be5dc3a.28978",
+        "5722f7fa.de6bf8",
+        "f5d4df71.72bd9"
+      ]
+    ]
+  },
+  {
+    "id": "e3ccef9e.d8f5c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n    \n",
+    "comments": "",
+    "x": 1811.5504150390625,
+    "y": 640.0660681724548,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5803dc5e.f9b2f4",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1236.5498447418213,
+    "y": 643.0660672187805,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "19f8e68c.c0f139"
+      ]
+    ]
+  },
+  {
+    "id": "19f8e68c.c0f139",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1416.5497951507568,
+    "y": 643.732617855072,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e3ccef9e.d8f5c"
+      ]
+    ]
+  },
+  {
+    "id": "aded6823.7e7e38",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1704.216682434082,
+    "y": 594.3993611335754,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e3ccef9e.d8f5c"
+      ]
+    ]
+  },
+  {
+    "id": "9be5dc3a.28978",
+    "type": "set",
+    "name": "set connection-attachment-ar from get",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
+    "comments": "",
+    "x": 2118.4759368896484,
+    "y": 506.0000858306885,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "f5d4df71.72bd9",
+    "type": "set",
+    "name": "set oper-status",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
+    "comments": "",
+    "x": 2052.4759674072266,
+    "y": 579.4285883903503,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5722f7fa.de6bf8",
+    "type": "switchNode",
+    "name": "switch order-status",
+    "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2062.475746154785,
+    "y": 545.0000224113464,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f7f47d29.7c18f",
+        "6f0c573a.005228",
+        "d906524b.eeb18"
+      ]
+    ]
+  },
+  {
+    "id": "f7f47d29.7c18f",
+    "type": "outcome",
+    "name": "outcome Created",
+    "xml": "<outcome value='Created'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2298.075828552246,
+    "y": 539.0000534057617,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "75eaa69a.304108"
+      ]
+    ]
+  },
+  {
+    "id": "6f0c573a.005228",
+    "type": "outcome",
+    "name": "outcome Other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2291.790328979492,
+    "y": 619.4286880493164,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e10d29a3.c09e38"
+      ]
+    ]
+  },
+  {
+    "id": "75eaa69a.304108",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2456.546501159668,
+    "y": 539.3757090568542,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e10d29a3.c09e38",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
+    "comments": "",
+    "x": 2467.698143005371,
+    "y": 618.0000872612,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "bc697557.abf938",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 955.334300994873,
+    "y": 690.4936022758484,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4e152126.794ef",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 649.3404006958008,
+    "y": 691.499972820282,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "bc697557.abf938"
+      ]
+    ]
+  },
+  {
+    "id": "1f3fc1a6.135f3e",
+    "type": "comment",
+    "name": "GET parent-service-data from mdsal to check existence of other End point",
+    "info": "",
+    "comments": "",
+    "x": 837.03173828125,
+    "y": 736.531750202179,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "3cf6b4b1.6a71dc",
+    "type": "for",
+    "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
+    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1728.2164459228516,
+    "y": 889.0042276382446,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "3bbeaaa4.0cfa26"
+      ]
+    ]
+  },
+  {
+    "id": "2e23abdc.47fd94",
+    "type": "switchNode",
+    "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
+    "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 812.2154693603516,
+    "y": 996.7182641029358,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6ff9a0ff.dcfb4",
+        "ff1c3916.739028",
+        "d0c138a.b8484c8"
+      ]
+    ]
+  },
+  {
+    "id": "6ff9a0ff.dcfb4",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1140.3584899902344,
+    "y": 1069.5755381584167,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "499e037f.3c991c"
+      ]
+    ]
+  },
+  {
+    "id": "fb95619e.dd7a7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1324.485752105713,
+    "y": 928.7015471458435,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "3cf6b4b1.6a71dc",
+        "ec079e89.408ea"
+      ]
+    ]
+  },
+  {
+    "id": "3bbeaaa4.0cfa26",
+    "type": "switchNode",
+    "name": "switch allotted-resource-id",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2168.3277740478516,
+    "y": 886.004029750824,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "3cfb776.1a6dc88",
+        "a6d574db.37ec88"
+      ]
+    ]
+  },
+  {
+    "id": "3cfb776.1a6dc88",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2341.1379890441895,
+    "y": 857.468644618988,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "4685a336.4a051c"
+      ]
+    ]
+  },
+  {
+    "id": "fb81e999.e435b8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2489.8984603881836,
+    "y": 914.325731754303,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "7ed4750e.b1d6fc"
+      ]
+    ]
+  },
+  {
+    "id": "7ed4750e.b1d6fc",
+    "type": "set",
+    "name": "set tmp.pidx and ptx.consumed-ar",
+    "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
+    "comments": "",
+    "x": 2724.755886077881,
+    "y": 912.8972640037537,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "ee9aeb2c.6677a8",
+    "type": "comment",
+    "name": "Check existence of other AR in parent service data",
+    "info": "Check if other allotted resource is available.",
+    "comments": "",
+    "x": 759.9939079284668,
+    "y": 901.8929591178894,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "ff1c3916.739028",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1155.0109596252441,
+    "y": 1008.6772217750549,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "d35c3b1d.717fa8"
+      ]
+    ]
+  },
+  {
+    "id": "499e037f.3c991c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: End points not available\" />\n    \n",
+    "comments": "",
+    "x": 1300.0108375549316,
+    "y": 1068.6774668693542,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "d0c138a.b8484c8",
+    "type": "other",
+    "name": "outcome 2",
+    "xml": "<outcome value='2'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1150.0107727050781,
+    "y": 929.6772475242615,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "fb95619e.dd7a7"
+      ]
+    ]
+  },
+  {
+    "id": "4685a336.4a051c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2499.1222038269043,
+    "y": 856.677387714386,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a6d574db.37ec88",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2348.1218452453613,
+    "y": 913.6772475242615,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "fb81e999.e435b8"
+      ]
+    ]
+  },
+  {
+    "id": "ec079e89.408ea",
+    "type": "switchNode",
+    "name": "switch tmp.found-in-ar",
+    "xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1537.0107498168945,
+    "y": 982.4550652503967,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "ad2dc2ca.dac11"
+      ]
+    ]
+  },
+  {
+    "id": "ad2dc2ca.dac11",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1708.01078414917,
+    "y": 983.5662865638733,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "94734e1b.67d7d"
+      ]
+    ]
+  },
+  {
+    "id": "94734e1b.67d7d",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1857.0108795166016,
+    "y": 983.566285610199,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "da051cb.7908ce",
+        "511eded7.ee48c"
+      ]
+    ]
+  },
+  {
+    "id": "df822a12.2f4cb8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2603.128704071045,
+    "y": 999.7951397895813,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "8bd33391.e91a4"
+      ]
+    ]
+  },
+  {
+    "id": "6d247d3c.af7454",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2594.9805068969727,
+    "y": 1034.8612246513367,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "c9893a00.c28658"
+      ]
+    ]
+  },
+  {
+    "id": "92501bf7.64e188",
+    "type": "switchNode",
+    "name": "switch mdsal-psd.service-data.networks_length",
+    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1600.344253540039,
+    "y": 1083.89990568161,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "7eda2112.68c74",
+        "8c5ad16c.a0bce"
+      ]
+    ]
+  },
+  {
+    "id": "8c5ad16c.a0bce",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1864.3441009521484,
+    "y": 1063.7886519432068,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "c88c0702.2f3eb8"
+      ]
+    ]
+  },
+  {
+    "id": "7eda2112.68c74",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1854.3441619873047,
+    "y": 1111.7886233329773,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "4b5ebe1.f906a4"
+      ]
+    ]
+  },
+  {
+    "id": "4b5ebe1.f906a4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
+    "comments": "",
+    "x": 1992.9965057373047,
+    "y": 1113.890384197235,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8c1e1bd2.c7dff8",
+    "type": "set",
+    "name": "set tmp.network.",
+    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n",
+    "comments": "",
+    "x": 2225.788959503174,
+    "y": 1064.788821697235,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "d35c3b1d.717fa8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1322.4552688598633,
+    "y": 1007.7884888648987,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "92501bf7.64e188"
+      ]
+    ]
+  },
+  {
+    "id": "c88c0702.2f3eb8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2023.1218719482422,
+    "y": 1066.7884860038757,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "8c1e1bd2.c7dff8",
+        "57349ad5.ce57b4"
+      ]
+    ]
+  },
+  {
+    "id": "57349ad5.ce57b4",
+    "type": "for",
+    "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
+    "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 2386.121910095215,
+    "y": 1112.788640499115,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9ba86c57.e6af5"
+      ]
+    ]
+  },
+  {
+    "id": "9ba86c57.e6af5",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2432.677978515625,
+    "y": 1343.7884497642517,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "919483e8.df2a",
+        "d15629b3.f55828",
+        "5656fc8f.8dd814",
+        "831174d3.18ba68",
+        "28da2331.d9adbc",
+        "5b35ac60.b06374",
+        "8c9ddaa9.6e1178",
+        "cc2b2a86.fe9858",
+        "95f6d795.6654c8",
+        "12d0e2b2.41538d"
+      ]
+    ]
+  },
+  {
+    "id": "919483e8.df2a",
+    "type": "switchNode",
+    "name": "switch access-node-id",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 2709.1881942749023,
+    "y": 1185.7991971969604,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "d89910f0.04363"
+      ]
+    ]
+  },
+  {
+    "id": "d89910f0.04363",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2898.1878204345703,
+    "y": 1187.7990617752075,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "7fb07ab0.8731f4"
+      ]
+    ]
+  },
+  {
+    "id": "7fb07ab0.8731f4",
+    "type": "set",
+    "name": "set tmp.found-in-network tmp.ep-available",
+    "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
+    "comments": "",
+    "x": 3151.1879959106445,
+    "y": 1187.3991079330444,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "d15629b3.f55828",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 2683.177646636963,
+    "y": 1559.7884883880615,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8f0a4580.6d9e98",
+    "type": "switchNode",
+    "name": "switch tmp.ep-available",
+    "xml": "<switch test='`$tmp.ep-available`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 675.3440704345703,
+    "y": 1192.2327990531921,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "a1aab633.7afd48",
+        "17b3ac8c.83db93"
+      ]
+    ]
+  },
+  {
+    "id": "17b3ac8c.83db93",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 894.0107898712158,
+    "y": 1241.566155910492,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6fbe74b1.19033c"
+      ]
+    ]
+  },
+  {
+    "id": "a1aab633.7afd48",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 898.8995914459229,
+    "y": 1150.5662169456482,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "afc8882a.f41778"
+      ]
+    ]
+  },
+  {
+    "id": "afc8882a.f41778",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1045.8995876312256,
+    "y": 1152.455029964447,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6fbe74b1.19033c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1064.121877670288,
+    "y": 1239.566113948822,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "55f0cf15.57d45",
+        "34353928.90fd66",
+        "ef27420c.8613d"
+      ]
+    ]
+  },
+  {
+    "id": "55f0cf15.57d45",
+    "type": "switchNode",
+    "name": "switch tmp.found-in-ar",
+    "xml": "<switch test='`$tmp.found-in-ar`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1290.2328910827637,
+    "y": 1206.566113948822,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6afed8e9.c144d8",
+        "d5770178.0518a"
+      ]
+    ]
+  },
+  {
+    "id": "6afed8e9.c144d8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1485.6773376464844,
+    "y": 1184.5661749839783,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "1eed655b.bd97fb"
+      ]
+    ]
+  },
+  {
+    "id": "d5770178.0518a",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1482.67724609375,
+    "y": 1232.5661597251892,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "b7fae121.44ba7"
+      ]
+    ]
+  },
+  {
+    "id": "1eed655b.bd97fb",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1673.2330017089844,
+    "y": 1181.5661749839783,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f7779e2d.37621"
+      ]
+    ]
+  },
+  {
+    "id": "b7fae121.44ba7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1670.23291015625,
+    "y": 1231.5661597251892,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "b98ba5f6.13f1f8"
+      ]
+    ]
+  },
+  {
+    "id": "62f66369.cc0c1c",
+    "type": "comment",
+    "name": "GET connection-attachment-ar to store AR data from mdsal",
+    "info": "",
+    "comments": "",
+    "x": 2182.5040855407715,
+    "y": 468.503945350647,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9290cc56.5053",
+    "type": "comment",
+    "name": "Set source end point",
+    "info": "",
+    "comments": "",
+    "x": 672.0039825439453,
+    "y": 557.2539653778076,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "f5e8e1c8.46298",
+    "type": "set",
+    "name": "set tmp.ar.parent-service-instance-id",
+    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
+    "comments": "",
+    "x": 723.0000762939453,
+    "y": 766.0000882148743,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "d0475d22.15b97",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1083.000228881836,
+    "y": 837.0000748634338,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "623d8d28.212994"
+      ]
+    ]
+  },
+  {
+    "id": "b0b29ede.9f732",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1074.8520317077637,
+    "y": 872.0661597251892,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "962f738f.25f05"
+      ]
+    ]
+  },
+  {
+    "id": "962f738f.25f05",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
+    "comments": "",
+    "x": 1221.0008125305176,
+    "y": 871.3335709571838,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "623d8d28.212994",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1214.0003242492676,
+    "y": 837.0001358985901,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c9893a00.c28658",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN provided attachment resource not found\" />\n    \n",
+    "comments": "",
+    "x": 2745.000556945801,
+    "y": 1035.0002627372742,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8bd33391.e91a4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2730.0006790161133,
+    "y": 1002.0002474784851,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e64a37c7.f66948",
+    "type": "set",
+    "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
+    "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
+    "comments": "",
+    "x": 809.0000152587891,
+    "y": 939.0000624656677,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "fc331758.5b2778",
+    "type": "comment",
+    "name": "If other EP exists set destination end point",
+    "info": "Check if other allotted resource is available.",
+    "comments": "",
+    "x": 726.0000152587891,
+    "y": 1117.0000109672546,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "93383afb.68afc8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1466.0001373291016,
+    "y": 1444.000292301178,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "23230d18.7a6212",
+        "a2526066.96f0c",
+        "93d759ca.c80638",
+        "cfe2307e.244ab",
+        "b727775.7f84888",
+        "373cb481.0be6cc",
+        "9ebd0cde.5ee4a",
+        "3f0a30ad.0a05f"
+      ]
+    ]
+  },
+  {
+    "id": "23230d18.7a6212",
+    "type": "switchNode",
+    "name": "switch access-node-id",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1708.5104389190674,
+    "y": 1314.0106887817383,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6e6de50.27a681c"
+      ]
+    ]
+  },
+  {
+    "id": "a2526066.96f0c",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 1681.5003910064697,
+    "y": 1619.0006523132324,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "93d759ca.c80638",
+    "type": "switchNode",
+    "name": "switch access-ltp-id",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1700.0002689361572,
+    "y": 1357.7782201766968,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "4537bdaa.d5e104"
+      ]
+    ]
+  },
+  {
+    "id": "cfe2307e.244ab",
+    "type": "switchNode",
+    "name": "switch clientSignal",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1694.0003070831299,
+    "y": 1403.7782669067383,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "7a3fa09e.aa469"
+      ]
+    ]
+  },
+  {
+    "id": "b727775.7f84888",
+    "type": "switchNode",
+    "name": "switch cVLAN",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1677.9898090362549,
+    "y": 1442.7677688598633,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "97596f16.2d148"
+      ]
+    ]
+  },
+  {
+    "id": "6e6de50.27a681c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1886.2223529815674,
+    "y": 1314.6670608520508,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "98c866c4.5a0d58"
+      ]
+    ]
+  },
+  {
+    "id": "98c866c4.5a0d58",
+    "type": "set",
+    "name": "set dst-access-node-id",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
+    "comments": "",
+    "x": 2061.2223529815674,
+    "y": 1314.2670359611511,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "4537bdaa.d5e104",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1881.7122211456299,
+    "y": 1357.4345169067383,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "779f9f70.9b8e"
+      ]
+    ]
+  },
+  {
+    "id": "7a3fa09e.aa469",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1881.7122211456299,
+    "y": 1403.4345169067383,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f9bbfd69.a91aa"
+      ]
+    ]
+  },
+  {
+    "id": "97596f16.2d148",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1881.7017230987549,
+    "y": 1442.4241409301758,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9e73cdad.1270d"
+      ]
+    ]
+  },
+  {
+    "id": "34353928.90fd66",
+    "type": "for",
+    "name": "for idx..tmp.ep.parameters[]",
+    "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1319,
+    "y": 1331.9999976158142,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "93383afb.68afc8"
+      ]
+    ]
+  },
+  {
+    "id": "f7779e2d.37621",
+    "type": "set",
+    "name": "set tmp.ep.parameters",
+    "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />\n",
+    "comments": "",
+    "x": 1885.0000553131104,
+    "y": 1181.000072002411,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "b98ba5f6.13f1f8",
+    "type": "set",
+    "name": "set tmp.ep.parameters",
+    "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n",
+    "comments": "",
+    "x": 1881.999963760376,
+    "y": 1227.0000567436218,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "779f9f70.9b8e",
+    "type": "set",
+    "name": "set dst-access-node-id",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
+    "comments": "",
+    "x": 2059.0001850128174,
+    "y": 1357.0003128051758,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "f9bbfd69.a91aa",
+    "type": "set",
+    "name": "set dst-clientSignal",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />",
+    "comments": "",
+    "x": 2053.0001850128174,
+    "y": 1401.0003128051758,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9e73cdad.1270d",
+    "type": "set",
+    "name": "set dst-cVLAN",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />",
+    "comments": "",
+    "x": 2044.0001850128174,
+    "y": 1440.0003128051758,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9a68bff2.8c292",
+    "type": "comment",
+    "name": "Get controller info and send request",
+    "info": "",
+    "comments": "",
+    "x": 1926.000057220459,
+    "y": 1911.0001511573792,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "aa539917.f17c98",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create ethernet Service",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 2464.0008239746094,
+    "y": 2179.0013360977173,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "129cac0c.055ac4",
+        "470289f4.54d198"
+      ]
+    ]
+  },
+  {
+    "id": "129cac0c.055ac4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2797.000648498535,
+    "y": 2188.0015811920166,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "540c8068.f38"
+      ]
+    ]
+  },
+  {
+    "id": "540c8068.f38",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 2945.000648498535,
+    "y": 2186.001459121704,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "86d52886.e02b08",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+    "comments": "",
+    "x": 2927.0006790161133,
+    "y": 2133.001519203186,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "470289f4.54d198",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2788.000587463379,
+    "y": 2133.001519203186,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "86d52886.e02b08"
+      ]
+    ]
+  },
+  {
+    "id": "d001a7e2.45abd8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 897.7624244689941,
+    "y": 2134.953706264496,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f4c6242e.026e78"
+      ]
+    ]
+  },
+  {
+    "id": "f4c6242e.026e78",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"AAI failed\" />\n",
+    "comments": "",
+    "x": 1064.2862453460693,
+    "y": 2161.5727133750916,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5249365f.05f8c8",
+    "type": "failure",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 899.8576526641846,
+    "y": 2182.715548992157,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f4c6242e.026e78"
+      ]
+    ]
+  },
+  {
+    "id": "f04e271d.103d68",
+    "type": "comment",
+    "name": "Save Resource to AAI",
+    "info": "",
+    "comments": "",
+    "x": 671.8100681304932,
+    "y": 2123.3028693199158,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "625b8a7b.c27e14",
+    "type": "set",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+    "comments": "",
+    "x": 686.5777645111084,
+    "y": 2044.8283505439758,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "b625537f.a1fdd",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 646.9909362792969,
+    "y": 2230.4441390037537,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "e5693b1c.1aac88",
+    "type": "execute",
+    "name": "execute RestApiCallNode - PUT AR by id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 739.3098468780518,
+    "y": 1969.4692034721375,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "cfef9f3f.14c39",
+        "72aa50f4.96321",
+        "28a18b03.896b34"
+      ]
+    ]
+  },
+  {
+    "id": "cfef9f3f.14c39",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 993.9512691497803,
+    "y": 2013.800597667694,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "492ba4ec.f6b39c"
+      ]
+    ]
+  },
+  {
+    "id": "72aa50f4.96321",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 995.9512920379639,
+    "y": 1972.3005618080497,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "492ba4ec.f6b39c"
+      ]
+    ]
+  },
+  {
+    "id": "28a18b03.896b34",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 999.7013759613037,
+    "y": 1923.6577143669128,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "85d2ed51.1b8c4"
+      ]
+    ]
+  },
+  {
+    "id": "492ba4ec.f6b39c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
+    "comments": "",
+    "x": 1154.70139503479,
+    "y": 1992.0506281852722,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "85d2ed51.1b8c4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1127.3573207855225,
+    "y": 1925.8498826026917,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e420c4c5.b6aac8",
+    "type": "set",
+    "name": "set ar-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
+    "comments": "",
+    "x": 641.5234622955322,
+    "y": 1803.8501045703888,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "31063248.d169de",
+    "type": "execute",
+    "name": "execute getTime",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 658.80930519104,
+    "y": 1876.469702243805,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f27d2f2b.5f557",
+    "type": "set",
+    "name": "set allotted-resource-oper-status",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+    "comments": "",
+    "x": 708.7963848114014,
+    "y": 1913.4207825660706,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9257aeaa.1b50e",
+    "type": "set",
+    "name": "set model-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
+    "comments": "",
+    "x": 655.3650035858154,
+    "y": 1843.0247550010681,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "32d6bb38.221fd4",
+    "type": "comment",
+    "name": "Prepare data for allotted-resource addition to MDSAL",
+    "info": "This will add to allotted-resource which is present inside service.",
+    "comments": "",
+    "x": 768.69846534729,
+    "y": 1764.0247070789337,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8d90c1db.edb92",
+    "type": "comment",
+    "name": "Add to allotted-resources in mdsal",
+    "info": "",
+    "comments": "",
+    "x": 710.2782917022705,
+    "y": 1731.4380087852478,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8bb4a5cf.68ff78",
+    "type": "update",
+    "name": "update AAI allotted-resource",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 698.2543468475342,
+    "y": 2160.75501203537,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "d001a7e2.45abd8",
+        "5249365f.05f8c8"
+      ]
+    ]
+  },
+  {
+    "id": "f242ac55.63689",
+    "type": "execute",
+    "name": "execute RestApiCallNode getPath from OOF",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1507.004306793213,
+    "y": 1723.2546639442444,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "8ebd53f.a1c8db",
+        "4a1f8620.db9dd8"
+      ]
+    ]
+  },
+  {
+    "id": "8ebd53f.a1c8db",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1747.0044479370117,
+    "y": 1747.2546334266663,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "386f994c.1e59a6"
+      ]
+    ]
+  },
+  {
+    "id": "2728f3f1.18be8c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 OOF api\" />\n",
+    "comments": "",
+    "x": 1886.004482269287,
+    "y": 1696.2547249794006,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "4a1f8620.db9dd8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1746.0042343139648,
+    "y": 1696.2547240257263,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "2728f3f1.18be8c"
+      ]
+    ]
+  },
+  {
+    "id": "f4212815.8844c8",
+    "type": "comment",
+    "name": "Get VPNs from OOF",
+    "info": "",
+    "comments": "",
+    "x": 1493.008228302002,
+    "y": 1690.2586636543274,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "30312f10.31bce",
+    "type": "for",
+    "name": "for vidx..oof.vpns_length[]",
+    "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 1447.004150390625,
+    "y": 1805.5043921470642,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6a968eb5.e990c"
+      ]
+    ]
+  },
+  {
+    "id": "50ffe7da.bf4678",
+    "type": "comment",
+    "name": "Loop through VPN and configure them",
+    "info": "",
+    "comments": "",
+    "x": 1493.0046005249023,
+    "y": 1940.0047698020935,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5656fc8f.8dd814",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n                \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2686.788330078125,
+    "y": 1277.1218237876892,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "55653cd7.ec43f4"
+      ]
+    ]
+  },
+  {
+    "id": "55653cd7.ec43f4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2875.788299560547,
+    "y": 1277.1218090057373,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "5525b0a7.6138f"
+      ]
+    ]
+  },
+  {
+    "id": "5525b0a7.6138f",
+    "type": "set",
+    "name": "set etht-svc-name & bandwidth-profile-name",
+    "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3116.78861618042,
+    "y": 1276.721863746643,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "831174d3.18ba68",
+    "type": "switchNode",
+    "name": "switch description",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2699.6282081604004,
+    "y": 1312.1219186782837,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "3b411fae.953a4"
+      ]
+    ]
+  },
+  {
+    "id": "3b411fae.953a4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2874.628273010254,
+    "y": 1314.121904373169,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "8774460.14dcdb8"
+      ]
+    ]
+  },
+  {
+    "id": "8774460.14dcdb8",
+    "type": "set",
+    "name": "set etht-svc-descr",
+    "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3030.9615898132324,
+    "y": 1311.5829792022705,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "28da2331.d9adbc",
+    "type": "switchNode",
+    "name": "switch tenantId",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2695.010471343994,
+    "y": 1345.4553089141846,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "ada04353.d80d1"
+      ]
+    ]
+  },
+  {
+    "id": "ada04353.d80d1",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2873.0104751586914,
+    "y": 1349.455186843872,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "cee74467.1a9228"
+      ]
+    ]
+  },
+  {
+    "id": "cee74467.1a9228",
+    "type": "set",
+    "name": "set tenantId",
+    "xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3011.0106620788574,
+    "y": 1346.0551624298096,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "8c9ddaa9.6e1178",
+    "type": "switchNode",
+    "name": "switch cir",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2677.850070953369,
+    "y": 1418.4552640914917,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "cd954fdf.ea0ed"
+      ]
+    ]
+  },
+  {
+    "id": "cd954fdf.ea0ed",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2872.8501358032227,
+    "y": 1419.4552640914917,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "31bd7e24.629462"
+      ]
+    ]
+  },
+  {
+    "id": "31bd7e24.629462",
+    "type": "set",
+    "name": "set cir",
+    "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 2997.18363571167,
+    "y": 1417.9163389205933,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "5b35ac60.b06374",
+    "type": "switchNode",
+    "name": "switch vpnType",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2692.158359527588,
+    "y": 1381.2329740524292,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "1d4c9619.a6669a"
+      ]
+    ]
+  },
+  {
+    "id": "1d4c9619.a6669a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2874.158546447754,
+    "y": 1384.2329587936401,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "bd64b5e6.539838"
+      ]
+    ]
+  },
+  {
+    "id": "bd64b5e6.539838",
+    "type": "set",
+    "name": "set vpnType",
+    "xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3010.492290496826,
+    "y": 1380.694200515747,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "cc2b2a86.fe9858",
+    "type": "switchNode",
+    "name": "switch eir",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2673.1404151916504,
+    "y": 1452.1531715393066,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "203ce537.bd8b2a"
+      ]
+    ]
+  },
+  {
+    "id": "203ce537.bd8b2a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2873.1406631469727,
+    "y": 1455.1531105041504,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "7faf1119.e88e9"
+      ]
+    ]
+  },
+  {
+    "id": "7faf1119.e88e9",
+    "type": "set",
+    "name": "set eir",
+    "xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 2996.4742851257324,
+    "y": 1454.614170074463,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "95f6d795.6654c8",
+    "type": "switchNode",
+    "name": "switch colorAware",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2698.141025543213,
+    "y": 1486.1530504226685,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "b60ea4bb.5cc238"
+      ]
+    ]
+  },
+  {
+    "id": "b60ea4bb.5cc238",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2869.1408462524414,
+    "y": 1492.152988910675,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6d5c307a.1a01c"
+      ]
+    ]
+  },
+  {
+    "id": "6d5c307a.1a01c",
+    "type": "set",
+    "name": "set colorAware",
+    "xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3017.47416305542,
+    "y": 1492.6142015457153,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "12d0e2b2.41538d",
+    "type": "switchNode",
+    "name": "switch couplingFlag",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2700.1409645080566,
+    "y": 1522.153112411499,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9768f5df.e54b58"
+      ]
+    ]
+  },
+  {
+    "id": "9768f5df.e54b58",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2872.1408462524414,
+    "y": 1531.153081893921,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9d447a7c.f87728"
+      ]
+    ]
+  },
+  {
+    "id": "9d447a7c.f87728",
+    "type": "set",
+    "name": "set couplingFlag",
+    "xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n",
+    "comments": "",
+    "x": 3025.47416305542,
+    "y": 1531.6142024993896,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "23c26849.b1be88",
+    "type": "comment",
+    "name": "Check if other EP exists in SOTNConnectionResource",
+    "info": "",
+    "comments": "",
+    "x": 2831.343994140625,
+    "y": 1140.7884497642517,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "1c7f6b36.0dde35",
+    "type": "comment",
+    "name": "Get other global parameters from network",
+    "info": "",
+    "comments": "",
+    "x": 2767.34375,
+    "y": 1226.7884497642517,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "373cb481.0be6cc",
+    "type": "switchNode",
+    "name": "switch access-provider-id",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1715.5661029815674,
+    "y": 1488.2329788208008,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "ff1ef452.ac6398"
+      ]
+    ]
+  },
+  {
+    "id": "ff1ef452.ac6398",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1902.5661029815674,
+    "y": 1484.2329788208008,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "ed2e9db3.52782"
+      ]
+    ]
+  },
+  {
+    "id": "ed2e9db3.52782",
+    "type": "set",
+    "name": "set access-provider-id",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 2070.5661029815674,
+    "y": 1484.8329849243164,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "9ebd0cde.5ee4a",
+    "type": "switchNode",
+    "name": "switch access-client-id",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1706.5661182403564,
+    "y": 1531.2434272766113,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "6a1f9494.a9099c"
+      ]
+    ]
+  },
+  {
+    "id": "6a1f9494.a9099c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1893.5661182403564,
+    "y": 1527.2434272766113,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "5c104369.10385c"
+      ]
+    ]
+  },
+  {
+    "id": "5c104369.10385c",
+    "type": "set",
+    "name": "set access-client-id",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 2061.5661182403564,
+    "y": 1527.843433380127,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "3f0a30ad.0a05f",
+    "type": "switchNode",
+    "name": "switch access-topology-id",
+    "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 1719.566062927246,
+    "y": 1573.2434582710266,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "b8481b61.974128"
+      ]
+    ]
+  },
+  {
+    "id": "b8481b61.974128",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1906.566062927246,
+    "y": 1569.2434582710266,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "cd99ec59.16d01"
+      ]
+    ]
+  },
+  {
+    "id": "cd99ec59.16d01",
+    "type": "set",
+    "name": "set access-topology-id",
+    "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 2074.566062927246,
+    "y": 1569.8434643745422,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "6a968eb5.e990c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1670.121467590332,
+    "y": 1842.3444514274597,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "25415b54.636c54",
+        "a5206342.9aba",
+        "51f40b71.957074",
+        "f753496f.fd6098",
+        "a5fc88b6.7da8a8",
+        "48526f97.44c48",
+        "e2b95315.238d5",
+        "1f7c3b05.6c25b5",
+        "15600759.2f8af9",
+        "38b5d1f7.8043be",
+        "3f572112.50e40e"
+      ]
+    ]
+  },
+  {
+    "id": "94168d9.4338d7",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "comments": "",
+    "x": 2311.566131591797,
+    "y": 1906.67764377594,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "1f7c3b05.6c25b5",
+    "type": "get-resource",
+    "name": "get-resource esr-thirdparty-sdnc",
+    "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1928.0660400390625,
+    "y": 1943.6775832176208,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "530a02a.35bc5fc",
+        "69cd2500.075b9c",
+        "30e7132.e91f7ec"
+      ]
+    ]
+  },
+  {
+    "id": "530a02a.35bc5fc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2148.065975189209,
+    "y": 1907.6775522232056,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "94168d9.4338d7"
+      ]
+    ]
+  },
+  {
+    "id": "69cd2500.075b9c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2157.556915283203,
+    "y": 1948.251558303833,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "5bd73e6e.fe56f"
+      ]
+    ]
+  },
+  {
+    "id": "30e7132.e91f7ec",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2152.889892578125,
+    "y": 1984.5848712921143,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "af020f5f.af078"
+      ]
+    ]
+  },
+  {
+    "id": "5bd73e6e.fe56f",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 2304.1282653808594,
+    "y": 1944.5373849868774,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "af020f5f.af078",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 2307.6625366210938,
+    "y": 1986.024019241333,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "e2b95315.238d5",
+    "type": "get-resource",
+    "name": "get-resource pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1873.565933227539,
+    "y": 1852.6772270202637,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "14ef11a9.e55e2e",
+        "226a17e2.188c38",
+        "6e24acbd.f1e944"
+      ]
+    ]
+  },
+  {
+    "id": "14ef11a9.e55e2e",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2055.5659790039062,
+    "y": 1797.6773371696472,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "24ab4d52.5b5102"
+      ]
+    ]
+  },
+  {
+    "id": "226a17e2.188c38",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2056.0568809509277,
+    "y": 1835.2514338493347,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "c7278eff.a4e77"
+      ]
+    ]
+  },
+  {
+    "id": "6e24acbd.f1e944",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2047.389892578125,
+    "y": 1868.5848088264465,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "86f1cee5.6a47d"
+      ]
+    ]
+  },
+  {
+    "id": "c7278eff.a4e77",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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",
+    "comments": "",
+    "x": 2203.628505706787,
+    "y": 1834.5373225212097,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "86f1cee5.6a47d",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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",
+    "comments": "",
+    "x": 2201.1625366210938,
+    "y": 1868.0239567756653,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "24ab4d52.5b5102",
+    "type": "set",
+    "name": "set tmp.thirdparty-sdnc-id",
+    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 2240.5659790039062,
+    "y": 1796.6774592399597,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "c836a451.421728",
+    "type": "comment",
+    "name": "get domain controller information",
+    "info": "",
+    "comments": "",
+    "x": 1924.0698471069336,
+    "y": 1819.681182384491,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "15600759.2f8af9",
+    "type": "set",
+    "name": "set oof.vpn",
+    "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
+    "comments": "",
+    "x": 1885.565933227539,
+    "y": 1773.7883105278015,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "a5206342.9aba",
+    "type": "save",
+    "name": "save VPN resource in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1900.0314102172852,
+    "y": 2350.750671863556,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "51f40b71.957074",
+    "type": "set",
+    "name": "set tmp.vpnName",
+    "xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />",
+    "comments": "",
+    "x": 1876.5314102172852,
+    "y": 2303.2503685951233,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "f753496f.fd6098",
+    "type": "save",
+    "name": "save connectivity relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1935.0314102172852,
+    "y": 2395.750427722931,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b6eef9a7.432da8",
+    "type": "comment",
+    "name": "save vpn and its relation to AAI",
+    "info": "",
+    "comments": "",
+    "x": 1918.031608581543,
+    "y": 2264.7506375312805,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "25415b54.636c54",
+    "type": "set",
+    "name": "set src-ltpId dst-ltpId",
+    "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
+    "comments": "",
+    "x": 1887.0314407348633,
+    "y": 2435.750547885895,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "a5fc88b6.7da8a8",
+    "type": "save",
+    "name": "save srcLTP relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1921.0316925048828,
+    "y": 2475.50075674057,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "48526f97.44c48",
+    "type": "save",
+    "name": "save dstLTP relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1919.0315246582031,
+    "y": 2521.2505955696106,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c941958.f53f068",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 865.0351867675781,
+    "y": 626.0039095878601,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "bf04a12d.5ab3a",
+        "5803dc5e.f9b2f4"
+      ]
+    ]
+  },
+  {
+    "id": "4e69710c.777f7",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource parent service data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 792.0353393554688,
+    "y": 853.0040726661682,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "d0475d22.15b97",
+        "b0b29ede.9f732"
+      ]
+    ]
+  },
+  {
+    "id": "7b1a01af.62e07",
+    "type": "execute",
+    "name": "get parent-service-data url",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 692.0352478027344,
+    "y": 816.0039057731628,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "da051cb.7908ce",
+    "type": "execute",
+    "name": "generate tmp.ar-other-url-connection",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-other-url-connection\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.provided-ar.allotted-resource-id`\"/>\n    \n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2106.0316009521484,
+    "y": 972.3334670066833,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "511eded7.ee48c",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-other-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2243.032241821289,
+    "y": 1014.8333315849304,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "df822a12.2f4cb8",
+        "6d247d3c.af7454"
+      ]
+    ]
+  },
+  {
+    "id": "386f994c.1e59a6",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1868.0315208435059,
+    "y": 1738.0001168251038,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ef27420c.8613d",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1245.0001335144043,
+    "y": 1763.0003008842468,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "f242ac55.63689",
+        "30312f10.31bce"
+      ]
+    ]
+  },
+  {
+    "id": "d906524b.eeb18",
+    "type": "outcome",
+    "name": "outcome PendingDelete",
+    "xml": "<outcome value='PendingDelete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2319.0625915527344,
+    "y": 578.03129529953,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e6b0a51.a605158"
+      ]
+    ]
+  },
+  {
+    "id": "e6b0a51.a605158",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2503.062602996826,
+    "y": 574.03129529953,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "38b5d1f7.8043be",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1948.5351867675781,
+    "y": 2070.003924846649,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "e9cfbd0.6beca4",
+        "329096c7.0b55ba"
+      ]
+    ]
+  },
+  {
+    "id": "e9cfbd0.6beca4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2183.535186767578,
+    "y": 2048.003924846649,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "44854a0f.60c554"
+      ]
+    ]
+  },
+  {
+    "id": "329096c7.0b55ba",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2175.785186767578,
+    "y": 2101.6468081474304,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "8f0a300b.e6801"
+      ]
+    ]
+  },
+  {
+    "id": "44854a0f.60c554",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 2337.535186767578,
+    "y": 2049.003924846649,
+    "z": "e47fc805.c5c588",
+    "wires": []
+  },
+  {
+    "id": "3f572112.50e40e",
+    "type": "switchNode",
+    "name": "switch prop.sdncRestApi.token_id",
+    "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1951.5312194824219,
+    "y": 2167.031491279602,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "71416b24.4767f4",
+        "95a4ed31.47c83"
+      ]
+    ]
+  },
+  {
+    "id": "71416b24.4767f4",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2177.531467437744,
+    "y": 2143.0313682556152,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "9a737a81.94bba8"
+      ]
+    ]
+  },
+  {
+    "id": "95a4ed31.47c83",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2171.5313453674316,
+    "y": 2206.5313692092896,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "aa539917.f17c98"
+      ]
+    ]
+  },
+  {
+    "id": "8f0a300b.e6801",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2334.53125,
+    "y": 2099.03125,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9a737a81.94bba8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create ethernet Service",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\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",
+    "comments": "",
+    "outputs": 1,
+    "x": 2465.53125,
+    "y": 2140.03125,
+    "z": "e47fc805.c5c588",
+    "wires": [
+      [
+        "470289f4.54d198",
+        "129cac0c.055ac4"
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
index a0faa6a9..bccb6189 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
@@ -1,2017 +1,2087 @@
-[
-  {
-    "id": "b0d71f3f.58b13",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 123,
-    "y": 32,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "962f9112.e764e"
-      ]
-    ]
-  },
-  {
-    "id": "962f9112.e764e",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "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}'>",
-    "outputs": 1,
-    "x": 304.00000381469727,
-    "y": 92.0000171661377,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "87a8de44.934de"
-      ]
-    ]
-  },
-  {
-    "id": "87a8de44.934de",
-    "type": "method",
-    "name": "sotn-attachment-topology-operation-deactivate",
-    "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 292.0001220703125,
-    "y": 180,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "b2d80288.ba823"
-      ]
-    ]
-  },
-  {
-    "id": "b2d80288.ba823",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 308.0001220703125,
-    "y": 735.0002446174622,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6613ec86.694124",
-        "f6decbbf.dd5e18",
-        "1fbc45c.0ff5aba",
-        "bc709271.507d8",
-        "1c40b1f3.81976e",
-        "4f9b598.14771a8",
-        "8522b683.befcf8",
-        "62f18656.44cfe8",
-        "683cb14.3ce605",
-        "c2e56bca.b33d78",
-        "802f8ef7.b6731",
-        "5c1eba3c.5a3914",
-        "d3793c0a.e76dd",
-        "a3a48876.1d8a18",
-        "7ccf367e.a869f8",
-        "2c211a2d.e90676",
-        "693977cc.87d158",
-        "c0b8662.2083398",
-        "fada7ab3.d1d4e8",
-        "cfef8c40.7d401"
-      ]
-    ]
-  },
-  {
-    "id": "6613ec86.694124",
-    "type": "set",
-    "name": "set tmp.ar.allotted-resource-id,etc",
-    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
-    "comments": "",
-    "x": 704.9935607910156,
-    "y": 133.9934868812561,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "c64c0419.fa25b8",
-    "type": "comment",
-    "name": "set tmp ar-id to fetch resource from MDSAL",
-    "info": "",
-    "comments": "",
-    "x": 733.9538726806641,
-    "y": 98.02528285980225,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "f6decbbf.dd5e18",
-    "type": "set",
-    "name": "set tmp.ar.self-link",
-    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
-    "comments": "",
-    "x": 658.9934997558594,
-    "y": 226.99349212646484,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "1c40b1f3.81976e",
-    "type": "execute",
-    "name": "execute Properties",
-    "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' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 665.2553901672363,
-    "y": 314.6602210998535,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "1fbc45c.0ff5aba",
-    "type": "execute",
-    "name": "generate allotted-resource tmp.ar-url",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 715.2554931640625,
-    "y": 401.66022205352783,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "61a9d102.2b159",
-    "type": "comment",
-    "name": "GET connection-attachment-allotted-resource from mdsal",
-    "info": "",
-    "comments": "",
-    "x": 758.8084869384766,
-    "y": 472.53876876831055,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "e3f68d6f.a262e",
-    "type": "comment",
-    "name": "Used for setting output to API Handler",
-    "info": "",
-    "comments": "",
-    "x": 712.9935302734375,
-    "y": 193.993501663208,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "b492f1ea.34bc2",
-    "type": "comment",
-    "name": "Obtain different URL, template location etc",
-    "info": "For saving resource information to MDSAL & for AAI",
-    "comments": "",
-    "x": 730.9934959411621,
-    "y": 279.8823823928833,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "d53312d8.be37d",
-    "type": "comment",
-    "name": "Used to Get AR by id to MDSAL, same as self-link",
-    "info": "",
-    "comments": "",
-    "x": 756.9935150146484,
-    "y": 366.8823413848877,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "e963cad3.e8d6c8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1199.6668281555176,
-    "y": 520.0000286102295,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "8ab48cf9.6862d"
-      ]
-    ]
-  },
-  {
-    "id": "8ab48cf9.6862d",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1368.6668319702148,
-    "y": 518.4999294281006,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "46b50e5a.245ae"
-      ]
-    ]
-  },
-  {
-    "id": "46b50e5a.245ae",
-    "type": "switchNode",
-    "name": "switch cr length",
-    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1541.5241012573242,
-    "y": 456.11909198760986,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "13dfccaf.a022c3",
-        "30d435f0.aca96a"
-      ]
-    ]
-  },
-  {
-    "id": "13dfccaf.a022c3",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1778.8573455810547,
-    "y": 434.1190423965454,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "2fbac1bd.15b6ee"
-      ]
-    ]
-  },
-  {
-    "id": "2fbac1bd.15b6ee",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic='true'>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1963.3812351226807,
-    "y": 431.02387619018555,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "5bdbcf18.37ca8",
-        "cbe39501.d4aef8",
-        "a9187100.e70c6"
-      ]
-    ]
-  },
-  {
-    "id": "6cd8cd98.bbac14",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
-    "comments": "",
-    "x": 1887.5190773010254,
-    "y": 556.0661172866821,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "489ff5d2.164b7c",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1191.5186309814453,
-    "y": 555.0661134719849,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6d0a26d5.df63e8"
-      ]
-    ]
-  },
-  {
-    "id": "6d0a26d5.df63e8",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1371.5185813903809,
-    "y": 555.7326641082764,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6cd8cd98.bbac14"
-      ]
-    ]
-  },
-  {
-    "id": "30d435f0.aca96a",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1767.1852989196777,
-    "y": 471.3994026184082,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6cd8cd98.bbac14"
-      ]
-    ]
-  },
-  {
-    "id": "5bdbcf18.37ca8",
-    "type": "set",
-    "name": "set connection-attachment-ar from get",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
-    "comments": "",
-    "x": 2209.444793701172,
-    "y": 391.0001058578491,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "a9187100.e70c6",
-    "type": "set",
-    "name": "set oper-status",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
-    "comments": "",
-    "x": 2142.4447898864746,
-    "y": 481.42866039276123,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "cbe39501.d4aef8",
-    "type": "switchNode",
-    "name": "switch order-status",
-    "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2153.444625854492,
-    "y": 435.0001096725464,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "1d7c3fd4.3573f",
-        "34a89ac4.b608e6"
-      ]
-    ]
-  },
-  {
-    "id": "1d7c3fd4.3573f",
-    "type": "outcome",
-    "name": "outcome Active",
-    "xml": "<outcome value='Active'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2360.044574737549,
-    "y": 425.0001096725464,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "fffa8dec.2b92a"
-      ]
-    ]
-  },
-  {
-    "id": "34a89ac4.b608e6",
-    "type": "outcome",
-    "name": "outcome Other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2359.7590942382812,
-    "y": 467.4287004470825,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "31994932.765476"
-      ]
-    ]
-  },
-  {
-    "id": "fffa8dec.2b92a",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2512.5151290893555,
-    "y": 423.3757600784302,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "31994932.765476",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
-    "comments": "",
-    "x": 2532.6669845581055,
-    "y": 464.000111579895,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ade228e6.1238f8",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 920.3031158447266,
-    "y": 616.4935908317566,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4f9b598.14771a8",
-    "type": "block",
-    "name": "block: atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 617.3092803955078,
-    "y": 617.4999389648438,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ade228e6.1238f8"
-      ]
-    ]
-  },
-  {
-    "id": "2ee127b4.83e818",
-    "type": "comment",
-    "name": "GET parent-service-data from mdsal to check existence of other End point",
-    "info": "",
-    "comments": "",
-    "x": 799.0004425048828,
-    "y": 678.5316982269287,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ac0c0701.4d5818",
-    "type": "for",
-    "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1689.1849975585938,
-    "y": 882.0040826797485,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6de65a21.ad20a4"
-      ]
-    ]
-  },
-  {
-    "id": "cf2de8b0.5bcd28",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1095.3269691467285,
-    "y": 1014.5755434036255,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "75a0a72c.5c3178"
-      ]
-    ]
-  },
-  {
-    "id": "2c958bf6.015ea4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1286.4543704986572,
-    "y": 879.7015712037683,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ac0c0701.4d5818"
-      ]
-    ]
-  },
-  {
-    "id": "6de65a21.ad20a4",
-    "type": "switchNode",
-    "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2124.296398162842,
-    "y": 882.0039796829224,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "9440a4ce.27b3b8",
-        "44e5c372.52cc1c"
-      ]
-    ]
-  },
-  {
-    "id": "9440a4ce.27b3b8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2333.106746673584,
-    "y": 862.4684362411499,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ce614dfc.389e4"
-      ]
-    ]
-  },
-  {
-    "id": "5d89c62c.f1ebc8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 2481.867500305176,
-    "y": 898.3256177902222,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "12052b78.fd51b5"
-      ]
-    ]
-  },
-  {
-    "id": "12052b78.fd51b5",
-    "type": "set",
-    "name": "set tmp.pidx and ptx.consumed-ar",
-    "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
-    "comments": "",
-    "x": 2716.724937438965,
-    "y": 896.8971490859985,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "2107b4e5.fcdf0c",
-    "type": "comment",
-    "name": "Check existence of other AR in parent service data",
-    "info": "Check if other allotted resource is available.",
-    "comments": "",
-    "x": 722.9628448486328,
-    "y": 848.8929204940796,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "103b0ff7.ad1fb",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1105.9793167114258,
-    "y": 949.677264213562,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "61e7696e.e32818"
-      ]
-    ]
-  },
-  {
-    "id": "75a0a72c.5c3178",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
-    "comments": "",
-    "x": 1267.9793128967285,
-    "y": 1013.677285194397,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "4057b675.85b588",
-    "type": "other",
-    "name": "outcome 2",
-    "xml": "<outcome value='2'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1111.9793910980225,
-    "y": 880.6772715821862,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "2c958bf6.015ea4"
-      ]
-    ]
-  },
-  {
-    "id": "ce614dfc.389e4",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2462.090805053711,
-    "y": 857.6771764755249,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "44e5c372.52cc1c",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2333.0907974243164,
-    "y": 896.6771802902222,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "5d89c62c.f1ebc8"
-      ]
-    ]
-  },
-  {
-    "id": "4960bf69.46744",
-    "type": "switchNode",
-    "name": "switch mdsal-psd.networks_length",
-    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1518.3129959106445,
-    "y": 952.8997611999512,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "21a6ff32.cc535",
-        "fd1b6df1.cb9a8"
-      ]
-    ]
-  },
-  {
-    "id": "fd1b6df1.cb9a8",
-    "type": "other",
-    "name": "outcome 1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1748.3130187988281,
-    "y": 928.7885932922363,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "bb9fff84.461e"
-      ]
-    ]
-  },
-  {
-    "id": "21a6ff32.cc535",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1742.3131408691406,
-    "y": 988.7885932922363,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "8d4e5f2f.b2054"
-      ]
-    ]
-  },
-  {
-    "id": "8d4e5f2f.b2054",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
-    "comments": "",
-    "x": 1914.9655265808105,
-    "y": 988.8903999328613,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "e3b0ecf2.4e878",
-    "type": "set",
-    "name": "set tmp.network.",
-    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n",
-    "comments": "",
-    "x": 2116.757942199707,
-    "y": 918.7887525558472,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "61e7696e.e32818",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1278.423671722412,
-    "y": 950.7885122299194,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "4960bf69.46744"
-      ]
-    ]
-  },
-  {
-    "id": "bb9fff84.461e",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1916.090690612793,
-    "y": 947.7884273529053,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "e3b0ecf2.4e878",
-        "2162bd86.35e6f2"
-      ]
-    ]
-  },
-  {
-    "id": "2162bd86.35e6f2",
-    "type": "for",
-    "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
-    "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 2292.09130859375,
-    "y": 990.7884349822998,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "15f15c9c.6120f3"
-      ]
-    ]
-  },
-  {
-    "id": "15f15c9c.6120f3",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2615.6469688415527,
-    "y": 991.7885122299194,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "1f8bf049.48a41",
-        "24ef27d4.5acd08"
-      ]
-    ]
-  },
-  {
-    "id": "1f8bf049.48a41",
-    "type": "switchNode",
-    "name": "switch access-node-id",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
-    "comments": "",
-    "outputs": 1,
-    "x": 2794.1570739746094,
-    "y": 975.7989301681519,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "8ecdc6ef.8a8ce8"
-      ]
-    ]
-  },
-  {
-    "id": "8ecdc6ef.8a8ce8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2981.1570739746094,
-    "y": 976.7989301681519,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "5c66b7eb.d5bf28"
-      ]
-    ]
-  },
-  {
-    "id": "5c66b7eb.d5bf28",
-    "type": "set",
-    "name": "set tmp.found-in-network tmp.ep-available",
-    "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
-    "comments": "",
-    "x": 3232.157081604004,
-    "y": 976.3988723754883,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "24ef27d4.5acd08",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 2777.14697265625,
-    "y": 1020.7885293960571,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "bc709271.507d8",
-    "type": "switchNode",
-    "name": "switch tmp.ep-available",
-    "xml": "<switch test='`$tmp.ep-available`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 654.3128662109375,
-    "y": 1153.2327852249146,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "18bdb942.c7be37",
-        "343945c7.6ea6fa"
-      ]
-    ]
-  },
-  {
-    "id": "343945c7.6ea6fa",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 836.9797019958496,
-    "y": 1177.5661935806274,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "eb3e9e9.a810a6"
-      ]
-    ]
-  },
-  {
-    "id": "18bdb942.c7be37",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 839.8684730529785,
-    "y": 1116.566291809082,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "33d109a0.0b3696"
-      ]
-    ]
-  },
-  {
-    "id": "33d109a0.0b3696",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 976.8685493469238,
-    "y": 1115.4551057815552,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "eb3e9e9.a810a6",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1007.0907897949219,
-    "y": 1175.5661516189575,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "d5bc9567.22f988"
-      ]
-    ]
-  },
-  {
-    "id": "eba7f62b.bd7668",
-    "type": "comment",
-    "name": "GET connection-attachment-ar to store AR data from mdsal",
-    "info": "",
-    "comments": "",
-    "x": 2192.472946166992,
-    "y": 355.5039691925049,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "2d6b93ab.08655c",
-    "type": "comment",
-    "name": "Set source end point",
-    "info": "",
-    "comments": "",
-    "x": 630.9728393554688,
-    "y": 585.2540645599365,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "8522b683.befcf8",
-    "type": "set",
-    "name": "set tmp.ar.parent-service-instance-id",
-    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
-    "comments": "",
-    "x": 683.9689178466797,
-    "y": 710.0002088546753,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "773fbfc3.82918",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1061.9689140319824,
-    "y": 759.000207901001,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "e1e0569.afbf9a8"
-      ]
-    ]
-  },
-  {
-    "id": "be2f70a0.4132d",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1053.8207168579102,
-    "y": 794.0662927627563,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "82d58d98.da526"
-      ]
-    ]
-  },
-  {
-    "id": "82d58d98.da526",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
-    "comments": "",
-    "x": 1228.9694023132324,
-    "y": 790.3336429595947,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "e1e0569.afbf9a8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1212.9689140319824,
-    "y": 757.000207901001,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "62f18656.44cfe8",
-    "type": "set",
-    "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
-    "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
-    "comments": "",
-    "x": 770.9689102172852,
-    "y": 884.0001821517944,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ba6cedb4.1637d",
-    "type": "comment",
-    "name": "If other EP exists delete from domain controller",
-    "info": "",
-    "comments": "",
-    "x": 704.9688110351562,
-    "y": 1077.999997138977,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "84d93cd2.2a2bf",
-    "type": "set",
-    "name": "set controller data",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
-    "comments": "",
-    "x": 2702.969627380371,
-    "y": 1368.0005893707275,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "3c2c4321.6e016c",
-    "type": "get-resource",
-    "name": "get-resource esr-thirdparty-sdnc",
-    "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2266.469566345215,
-    "y": 1427.0005893707275,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "b9c78202.065c4",
-        "b1e4c467.b20658",
-        "7cb01101.04dc1"
-      ]
-    ]
-  },
-  {
-    "id": "b9c78202.065c4",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2505.469566345215,
-    "y": 1380.0005893707275,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "84d93cd2.2a2bf"
-      ]
-    ]
-  },
-  {
-    "id": "b1e4c467.b20658",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2508.96053314209,
-    "y": 1427.5746250152588,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "912e3892.c38738"
-      ]
-    ]
-  },
-  {
-    "id": "7cb01101.04dc1",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2504.29354095459,
-    "y": 1468.90793800354,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ba048e79.e103b"
-      ]
-    ]
-  },
-  {
-    "id": "912e3892.c38738",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 2685.5319442749023,
-    "y": 1415.8603610992432,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ba048e79.e103b",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-    "comments": "",
-    "x": 2692.0660972595215,
-    "y": 1464.3471307754517,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ac6b10fc.018ca",
-    "type": "get-resource",
-    "name": "get-resource pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2215.9697341918945,
-    "y": 1319.000418663025,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "7d25011f.79dd3",
-        "abbaec43.33e1c",
-        "9bfad8e.2252b28"
-      ]
-    ]
-  },
-  {
-    "id": "7d25011f.79dd3",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2403.9697494506836,
-    "y": 1265.0004110336304,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "addfa25b.c3718"
-      ]
-    ]
-  },
-  {
-    "id": "abbaec43.33e1c",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2409.460796356201,
-    "y": 1307.5743074417114,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6b2117db.4230f8"
-      ]
-    ]
-  },
-  {
-    "id": "9bfad8e.2252b28",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2395.793804168701,
-    "y": 1345.9076433181763,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "c5a2b6cb.8de6a8"
-      ]
-    ]
-  },
-  {
-    "id": "6b2117db.4230f8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2563.032096862793,
-    "y": 1297.8601140975952,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "c5a2b6cb.8de6a8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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",
-    "comments": "",
-    "x": 2559.566276550293,
-    "y": 1337.3469333648682,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "addfa25b.c3718",
-    "type": "set",
-    "name": "set tmp.thirdparty-sdnc-id",
-    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
-    "comments": "",
-    "x": 2603.9697647094727,
-    "y": 1260.0004110336304,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "44ef1c3d.800ab4",
-    "type": "comment",
-    "name": "get domain controller information",
-    "info": "",
-    "comments": "",
-    "x": 2259.4736404418945,
-    "y": 1288.0043859481812,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "7164fdca.4a0d84",
-    "type": "execute",
-    "name": "execute RestApiCallNode Delete ethernet Service",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`\" />\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=\"delete\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 2308.969596862793,
-    "y": 1681.0005912780762,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "2b22380a.f1bc58",
-        "2dc816f1.66c67a"
-      ]
-    ]
-  },
-  {
-    "id": "2b22380a.f1bc58",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2595.9695358276367,
-    "y": 1704.0005912780762,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "2a372b2.85f3bd4"
-      ]
-    ]
-  },
-  {
-    "id": "2a372b2.85f3bd4",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 2765.9694747924805,
-    "y": 1707.0005912780762,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9ab48a6d.252ca8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
-    "comments": "",
-    "x": 2765.969596862793,
-    "y": 1663.0005912780762,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "2dc816f1.66c67a",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2598.9694747924805,
-    "y": 1663.0005912780762,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "9ab48a6d.252ca8"
-      ]
-    ]
-  },
-  {
-    "id": "b8fd2a49.d0b368",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 933.7307472229004,
-    "y": 1677.9527901411057,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "4d3bfe83.8ac38"
-      ]
-    ]
-  },
-  {
-    "id": "4d3bfe83.8ac38",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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=\"AAI failed\" />\n",
-    "comments": "",
-    "x": 1100.2546272277832,
-    "y": 1689.5718611478806,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "59f13b89.e4e7d4",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 940.8260345458984,
-    "y": 1710.7147578001022,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "4d3bfe83.8ac38"
-      ]
-    ]
-  },
-  {
-    "id": "65a9cdb6.115924",
-    "type": "comment",
-    "name": "Save Resource to AAI",
-    "info": "",
-    "comments": "",
-    "x": 652.7784614562988,
-    "y": 1660.3021783828735,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "a3a48876.1d8a18",
-    "type": "set",
-    "name": "set output to api handler",
-    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
-    "comments": "",
-    "x": 667.5461578369141,
-    "y": 1581.8276596069336,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "7ccf367e.a869f8",
-    "type": "returnSuccess",
-    "name": "return success",
-    "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",
-    "comments": "",
-    "x": 635.9592399597168,
-    "y": 1742.4434118270874,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "d3793c0a.e76dd",
-    "type": "execute",
-    "name": "execute RestApiCallNode - PUT AR by id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 717.2782592773438,
-    "y": 1489.468433380127,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "c94958cd.0f7e08",
-        "5e263814.55f358",
-        "1ecab8f8.94f047"
-      ]
-    ]
-  },
-  {
-    "id": "c94958cd.0f7e08",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 985.9196357727051,
-    "y": 1540.799845121801,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "916b12ec.48653"
-      ]
-    ]
-  },
-  {
-    "id": "5e263814.55f358",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 976.9196853637695,
-    "y": 1509.2998708710074,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "916b12ec.48653"
-      ]
-    ]
-  },
-  {
-    "id": "1ecab8f8.94f047",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 980.6697235107422,
-    "y": 1479.6569757461548,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "9a61150.9613ce8"
-      ]
-    ]
-  },
-  {
-    "id": "916b12ec.48653",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
-    "comments": "",
-    "x": 1146.6697235107422,
-    "y": 1510.0498947128654,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "9a61150.9613ce8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1122.3256912231445,
-    "y": 1475.849144935608,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "683cb14.3ce605",
-    "type": "set",
-    "name": "set ar-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
-    "comments": "",
-    "x": 617.4918785095215,
-    "y": 1339.8493564128876,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "802f8ef7.b6731",
-    "type": "execute",
-    "name": "execute getTime",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 634.7777214050293,
-    "y": 1412.4689540863037,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5c1eba3c.5a3914",
-    "type": "set",
-    "name": "set allotted-resource-oper-status",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
-    "comments": "",
-    "x": 689.764778137207,
-    "y": 1450.4200916290283,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "c2e56bca.b33d78",
-    "type": "set",
-    "name": "set model-data",
-    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
-    "comments": "",
-    "x": 631.3334197998047,
-    "y": 1379.024006843567,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ae41f871.b43fa8",
-    "type": "comment",
-    "name": "Prepare data for allotted-resource addition to MDSAL",
-    "info": "This will add to allotted-resource which is present inside service.",
-    "comments": "",
-    "x": 744.6668815612793,
-    "y": 1300.0239589214325,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "e752535c.aeb57",
-    "type": "comment",
-    "name": "Add to allotted-resources in mdsal",
-    "info": "",
-    "comments": "",
-    "x": 686.2467079162598,
-    "y": 1267.4372606277466,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "2c211a2d.e90676",
-    "type": "update",
-    "name": "update AAI allotted-resource",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 679.2227401733398,
-    "y": 1697.7543210983276,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "b8fd2a49.d0b368",
-        "59f13b89.e4e7d4"
-      ]
-    ]
-  },
-  {
-    "id": "d5bc9567.22f988",
-    "type": "get-resource",
-    "name": "get-resource connectivity",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.service-data.networks.network[0].network-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.connectivity' local-only='false' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1213.0005645751953,
-    "y": 1175.5044269561768,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "7024d4cd.1a62bc",
-        "cf432033.112d9"
-      ]
-    ]
-  },
-  {
-    "id": "41a48915.ce4758",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1986.1178741455078,
-    "y": 1372.3445596694946,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ae412232.e0411",
-        "3c342d96.9776c2",
-        "ac6b10fc.018ca",
-        "3c2c4321.6e016c",
-        "7164fdca.4a0d84",
-        "dda1ddc2.84784",
-        "f1f4e6ef.143a68"
-      ]
-    ]
-  },
-  {
-    "id": "d567023b.2d9f",
-    "type": "outcome",
-    "name": "vpn-binding",
-    "xml": "<outcome value='vpn-binding'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1812.286392211914,
-    "y": 1374.8260831832886,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "41a48915.ce4758"
-      ]
-    ]
-  },
-  {
-    "id": "de835816.465b48",
-    "type": "for",
-    "name": "for each relationship",
-    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1434.0003356933594,
-    "y": 1373.0043096542358,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "a2ccacd2.b0dbc"
-      ]
-    ]
-  },
-  {
-    "id": "a2ccacd2.b0dbc",
-    "type": "switchNode",
-    "name": "switch related-to",
-    "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1646.0003471374512,
-    "y": 1374.0043096542358,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "d567023b.2d9f"
-      ]
-    ]
-  },
-  {
-    "id": "3c342d96.9776c2",
-    "type": "set",
-    "name": "set tmp.vpn-name",
-    "xml": "<set>\n<parameter name='tmp.vpn-name' value=\"`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` \" />\n",
-    "comments": "",
-    "x": 2219.0005416870117,
-    "y": 1086.004626274109,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ae412232.e0411",
-    "type": "execute",
-    "name": "split vpnName to find nodeId",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.vpn-name`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2255.0004959106445,
-    "y": 1187.0039930343628,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ae670977.becbb8",
-        "60767ce2.3ab0a4"
-      ]
-    ]
-  },
-  {
-    "id": "60767ce2.3ab0a4",
-    "type": "failure",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2456.000686645508,
-    "y": 1164.0039854049683,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "bf10a60c.fdea98"
-      ]
-    ]
-  },
-  {
-    "id": "bf10a60c.fdea98",
-    "type": "set",
-    "name": "set tmp.node-id",
-    "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n<parameter name='tmp.actual.vpn-name' value='`$route1[1]`' />\n",
-    "comments": "",
-    "x": 2609.000846862793,
-    "y": 1162.0039863586426,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "a5afcc72.d877b",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
-    "comments": "",
-    "x": 2593.001012802124,
-    "y": 1211.0039882659912,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ae670977.becbb8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2453.00066947937,
-    "y": 1212.0039901733398,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "a5afcc72.d877b"
-      ]
-    ]
-  },
-  {
-    "id": "7024d4cd.1a62bc",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1394.0001640319824,
-    "y": 1210.0000715255737,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "ea43f44.e748208"
-      ]
-    ]
-  },
-  {
-    "id": "cf432033.112d9",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1396.851894378662,
-    "y": 1137.0663166046143,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "801260ca.47a9"
-      ]
-    ]
-  },
-  {
-    "id": "801260ca.47a9",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connectivity resource not found\" />\n    \n",
-    "comments": "",
-    "x": 1539.0006637573242,
-    "y": 1137.3337268829346,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "ea43f44.e748208",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1396.0001754760742,
-    "y": 1288.0002374649048,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "de835816.465b48"
-      ]
-    ]
-  },
-  {
-    "id": "693977cc.87d158",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 832.3339538574219,
-    "y": 536.4999494552612,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "e963cad3.e8d6c8",
-        "489ff5d2.164b7c"
-      ]
-    ]
-  },
-  {
-    "id": "c0b8662.2083398",
-    "type": "execute",
-    "name": "get parent-service-data tmp.ar-url-psd",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 686.0001983642578,
-    "y": 745.0002107620239,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fada7ab3.d1d4e8",
-    "type": "execute",
-    "name": "execute RestApiCallNode - get-resource parent service data",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 753.0001602172852,
-    "y": 780.0002946853638,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "773fbfc3.82918",
-        "be2f70a0.4132d"
-      ]
-    ]
-  },
-  {
-    "id": "cfef8c40.7d401",
-    "type": "switchNode",
-    "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
-    "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 769.1842803955078,
-    "y": 954.7181224822998,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "cf2de8b0.5bcd28",
-        "103b0ff7.ad1fb",
-        "4057b675.85b588"
-      ]
-    ]
-  },
-  {
-    "id": "dda1ddc2.84784",
-    "type": "update",
-    "name": "delete AAI vpn-binding",
-    "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpn-name' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 2239.999954223633,
-    "y": 1784.0001649856567,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "c726da18.1fa408",
-        "b99e2363.4f50b"
-      ]
-    ]
-  },
-  {
-    "id": "c726da18.1fa408",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2494.5079612731934,
-    "y": 1764.1986340284348,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "53701c4b.a688d4"
-      ]
-    ]
-  },
-  {
-    "id": "b99e2363.4f50b",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2501.6032485961914,
-    "y": 1796.9606016874313,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "53701c4b.a688d4"
-      ]
-    ]
-  },
-  {
-    "id": "53701c4b.a688d4",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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=\"AAI failed\" />\n",
-    "comments": "",
-    "x": 2661.031841278076,
-    "y": 1775.8177050352097,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "f1f4e6ef.143a68",
-    "type": "execute",
-    "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 2279.7541580200195,
-    "y": 1564.254002571106,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "f8436b41.519d68",
-        "9d9f79f.4a7c888"
-      ]
-    ]
-  },
-  {
-    "id": "f8436b41.519d68",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2514.7541580200195,
-    "y": 1542.254002571106,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "1076a472.b53e4c"
-      ]
-    ]
-  },
-  {
-    "id": "9d9f79f.4a7c888",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2507.0041580200195,
-    "y": 1595.8968858718872,
-    "z": "ed10e8c7.d58f28",
-    "wires": [
-      [
-        "6534e8a7.2122d8"
-      ]
-    ]
-  },
-  {
-    "id": "6534e8a7.2122d8",
-    "type": "returnFailure",
-    "name": "return failure",
-    "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 get token rest api\" />\n",
-    "comments": "",
-    "x": 2659.7541580200195,
-    "y": 1595.6469469070435,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  },
-  {
-    "id": "1076a472.b53e4c",
-    "type": "set",
-    "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
-    "comments": "",
-    "x": 2668.7541580200195,
-    "y": 1543.254002571106,
-    "z": "ed10e8c7.d58f28",
-    "wires": []
-  }
-]
+[
+  {
+    "id": "ff549c79.63961",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 94.03125,
+    "y": 49.00012397766113,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "a05176da.ae3e48"
+      ]
+    ]
+  },
+  {
+    "id": "a05176da.ae3e48",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "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}'>",
+    "outputs": 1,
+    "x": 275.03125381469727,
+    "y": 109.00014114379883,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "fe524cbe.32e62"
+      ]
+    ]
+  },
+  {
+    "id": "fe524cbe.32e62",
+    "type": "method",
+    "name": "sotn-attachment-topology-operation-deactivate",
+    "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 263.0313720703125,
+    "y": 197.00012397766113,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "437c9c25.6eb2d4"
+      ]
+    ]
+  },
+  {
+    "id": "437c9c25.6eb2d4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 279.0313720703125,
+    "y": 752.0003685951233,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "a802b53.c930648",
+        "1068510.ffabdaf",
+        "90b4d4b2.478c88",
+        "96a33d9.74471c",
+        "f6798703.c71c48",
+        "74b419be.6c1dc8",
+        "cea5b658.f38fb8",
+        "8fc6baf4.1c66d8",
+        "bd5b936a.6f494",
+        "1ecf912a.ad8d5f",
+        "754f8876.c41b88",
+        "1fa63937.8805f7",
+        "8e1d23f5.d1706",
+        "d507ebff.314fd8",
+        "9f388371.4f18e",
+        "31cf3c93.494fc4",
+        "61d4f147.44641",
+        "7bc058aa.42a598",
+        "7c847f3c.b2ac4",
+        "f0fb1a1c.cc2828"
+      ]
+    ]
+  },
+  {
+    "id": "a802b53.c930648",
+    "type": "set",
+    "name": "set tmp.ar.allotted-resource-id,etc",
+    "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
+    "comments": "",
+    "x": 676.0248107910156,
+    "y": 150.99361085891724,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "88124680.e6b8a8",
+    "type": "comment",
+    "name": "set tmp ar-id to fetch resource from MDSAL",
+    "info": "",
+    "comments": "",
+    "x": 704.9851226806641,
+    "y": 115.02540683746338,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "1068510.ffabdaf",
+    "type": "set",
+    "name": "set tmp.ar.self-link",
+    "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
+    "comments": "",
+    "x": 630.0247497558594,
+    "y": 243.99361610412598,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "f6798703.c71c48",
+    "type": "execute",
+    "name": "execute Properties",
+    "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' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 636.2866401672363,
+    "y": 331.66034507751465,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "90b4d4b2.478c88",
+    "type": "execute",
+    "name": "generate allotted-resource tmp.ar-url",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 686.2867431640625,
+    "y": 418.66034603118896,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "182d3b03.4e2c15",
+    "type": "comment",
+    "name": "GET connection-attachment-allotted-resource from mdsal",
+    "info": "",
+    "comments": "",
+    "x": 729.8397369384766,
+    "y": 489.5388927459717,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "bbe52b99.83dd68",
+    "type": "comment",
+    "name": "Used for setting output to API Handler",
+    "info": "",
+    "comments": "",
+    "x": 684.0247802734375,
+    "y": 210.99362564086914,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "dce4912.220bb7",
+    "type": "comment",
+    "name": "Obtain different URL, template location etc",
+    "info": "For saving resource information to MDSAL & for AAI",
+    "comments": "",
+    "x": 702.0247459411621,
+    "y": 296.88250637054443,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "66940a34.fde394",
+    "type": "comment",
+    "name": "Used to Get AR by id to MDSAL, same as self-link",
+    "info": "",
+    "comments": "",
+    "x": 728.0247650146484,
+    "y": 383.8824653625488,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "55776be8.abf844",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1170.6980781555176,
+    "y": 537.0001525878906,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "5a06af0c.5db4c"
+      ]
+    ]
+  },
+  {
+    "id": "5a06af0c.5db4c",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1339.6980819702148,
+    "y": 535.5000534057617,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "faae066.03a7ef8"
+      ]
+    ]
+  },
+  {
+    "id": "faae066.03a7ef8",
+    "type": "switchNode",
+    "name": "switch cr length",
+    "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1512.5553512573242,
+    "y": 473.119215965271,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "74bd4c84.2a01f4",
+        "6215df1.a21872"
+      ]
+    ]
+  },
+  {
+    "id": "74bd4c84.2a01f4",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1749.8885955810547,
+    "y": 451.11916637420654,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "932b115b.ef744"
+      ]
+    ]
+  },
+  {
+    "id": "932b115b.ef744",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic='true'>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1934.4124851226807,
+    "y": 448.0240001678467,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "d5b08a67.3e5c48",
+        "5ce1e592.04689c",
+        "fa1f1660.477578"
+      ]
+    ]
+  },
+  {
+    "id": "1d1825f2.925d0a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 1858.5503273010254,
+    "y": 573.0662412643433,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "2f2bf02.ca60d1",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1162.5498809814453,
+    "y": 572.066237449646,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "82e6da2.ad6fd28"
+      ]
+    ]
+  },
+  {
+    "id": "82e6da2.ad6fd28",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1342.5498313903809,
+    "y": 572.7327880859375,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "1d1825f2.925d0a"
+      ]
+    ]
+  },
+  {
+    "id": "6215df1.a21872",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1738.2165489196777,
+    "y": 488.39952659606934,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "1d1825f2.925d0a"
+      ]
+    ]
+  },
+  {
+    "id": "d5b08a67.3e5c48",
+    "type": "set",
+    "name": "set connection-attachment-ar from get",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
+    "comments": "",
+    "x": 2180.476043701172,
+    "y": 408.00022983551025,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "fa1f1660.477578",
+    "type": "set",
+    "name": "set oper-status",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
+    "comments": "",
+    "x": 2113.4760398864746,
+    "y": 498.42878437042236,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "5ce1e592.04689c",
+    "type": "switchNode",
+    "name": "switch order-status",
+    "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2124.475875854492,
+    "y": 452.0002336502075,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "46412cb7.a5f6f4",
+        "b5fc3d64.54bed"
+      ]
+    ]
+  },
+  {
+    "id": "46412cb7.a5f6f4",
+    "type": "outcome",
+    "name": "outcome Active",
+    "xml": "<outcome value='Active'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2331.075824737549,
+    "y": 442.0002336502075,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "11963437.b728dc"
+      ]
+    ]
+  },
+  {
+    "id": "b5fc3d64.54bed",
+    "type": "outcome",
+    "name": "outcome Other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2330.7903442382812,
+    "y": 484.42882442474365,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "1c1d147e.4224ac"
+      ]
+    ]
+  },
+  {
+    "id": "11963437.b728dc",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2483.5463790893555,
+    "y": 440.3758840560913,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1c1d147e.4224ac",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
+    "comments": "",
+    "x": 2503.6982345581055,
+    "y": 481.00023555755615,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "6ad0e2bd.71bc3c",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 891.3343658447266,
+    "y": 633.4937148094177,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "74b419be.6c1dc8",
+    "type": "block",
+    "name": "block: atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 588.3405303955078,
+    "y": 634.5000629425049,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6ad0e2bd.71bc3c"
+      ]
+    ]
+  },
+  {
+    "id": "8a5e890a.680be8",
+    "type": "comment",
+    "name": "GET parent-service-data from mdsal to check existence of other End point",
+    "info": "",
+    "comments": "",
+    "x": 770.0316925048828,
+    "y": 695.5318222045898,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "2205c5d5.df45ea",
+    "type": "for",
+    "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]",
+    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1660.2162475585938,
+    "y": 899.0042066574097,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "325e72dd.42ae0e"
+      ]
+    ]
+  },
+  {
+    "id": "f3fcb7.3cb38348",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1066.3582191467285,
+    "y": 1031.5756673812866,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "ed4934e0.63e078"
+      ]
+    ]
+  },
+  {
+    "id": "640c50fa.9b815",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1257.4856204986572,
+    "y": 896.7016951814294,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "2205c5d5.df45ea"
+      ]
+    ]
+  },
+  {
+    "id": "325e72dd.42ae0e",
+    "type": "switchNode",
+    "name": "switch allotted-resource-id",
+    "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2095.327648162842,
+    "y": 899.0041036605835,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "27ec9aa5.cff036",
+        "495a6869.e7e8d8"
+      ]
+    ]
+  },
+  {
+    "id": "27ec9aa5.cff036",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2304.137996673584,
+    "y": 879.468560218811,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "ac118201.9b0e6"
+      ]
+    ]
+  },
+  {
+    "id": "7260dcf8.1fb0a4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2452.898750305176,
+    "y": 915.3257417678833,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "5e185008.36b4b"
+      ]
+    ]
+  },
+  {
+    "id": "5e185008.36b4b",
+    "type": "set",
+    "name": "set tmp.pidx and ptx.consumed-ar",
+    "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
+    "comments": "",
+    "x": 2687.756187438965,
+    "y": 913.8972730636597,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "b3d0356b.e2dd48",
+    "type": "comment",
+    "name": "Check existence of other AR in parent service data",
+    "info": "Check if other allotted resource is available.",
+    "comments": "",
+    "x": 693.9940948486328,
+    "y": 865.8930444717407,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "31b6e940.d005b6",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1077.0105667114258,
+    "y": 966.6773881912231,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "864fe6a.0f93518"
+      ]
+    ]
+  },
+  {
+    "id": "ed4934e0.63e078",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 1239.0105628967285,
+    "y": 1030.677409172058,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "998ab047.1d3cb",
+    "type": "other",
+    "name": "outcome 2",
+    "xml": "<outcome value='2'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1083.0106410980225,
+    "y": 897.6773955598474,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "640c50fa.9b815"
+      ]
+    ]
+  },
+  {
+    "id": "ac118201.9b0e6",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2433.122055053711,
+    "y": 874.677300453186,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "495a6869.e7e8d8",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2304.1220474243164,
+    "y": 913.6773042678833,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "7260dcf8.1fb0a4"
+      ]
+    ]
+  },
+  {
+    "id": "e0954e7f.0fc95",
+    "type": "switchNode",
+    "name": "switch mdsal-psd.networks_length",
+    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1489.3442459106445,
+    "y": 969.8998851776123,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6d21348c.4e000c",
+        "8b08dda8.1325d"
+      ]
+    ]
+  },
+  {
+    "id": "8b08dda8.1325d",
+    "type": "other",
+    "name": "outcome 1",
+    "xml": "<outcome value='1'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1719.3442687988281,
+    "y": 945.7887172698975,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "2e4674ae.83d44c"
+      ]
+    ]
+  },
+  {
+    "id": "6d21348c.4e000c",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1713.3443908691406,
+    "y": 1005.7887172698975,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "33f517e8.5f1128"
+      ]
+    ]
+  },
+  {
+    "id": "33f517e8.5f1128",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
+    "comments": "",
+    "x": 1885.9967765808105,
+    "y": 1005.8905239105225,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "6f8f7dac.c1bd54",
+    "type": "set",
+    "name": "set tmp.network.",
+    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n",
+    "comments": "",
+    "x": 2087.789192199707,
+    "y": 935.7888765335083,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "864fe6a.0f93518",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1249.454921722412,
+    "y": 967.7886362075806,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "e0954e7f.0fc95"
+      ]
+    ]
+  },
+  {
+    "id": "2e4674ae.83d44c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1887.121940612793,
+    "y": 964.7885513305664,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6f8f7dac.c1bd54",
+        "ac5226f5.253788"
+      ]
+    ]
+  },
+  {
+    "id": "ac5226f5.253788",
+    "type": "for",
+    "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
+    "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 2263.12255859375,
+    "y": 1007.7885589599609,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "314fe564.900c2a"
+      ]
+    ]
+  },
+  {
+    "id": "314fe564.900c2a",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2586.6782188415527,
+    "y": 1008.7886362075806,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6d64b0f1.beb81",
+        "e3bdd7fd.7d8fe8"
+      ]
+    ]
+  },
+  {
+    "id": "6d64b0f1.beb81",
+    "type": "switchNode",
+    "name": "switch access-node-id",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 2765.1883239746094,
+    "y": 992.799054145813,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "c510bd0d.90a2"
+      ]
+    ]
+  },
+  {
+    "id": "c510bd0d.90a2",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2952.1883239746094,
+    "y": 993.799054145813,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "a92bc658.3e7468"
+      ]
+    ]
+  },
+  {
+    "id": "a92bc658.3e7468",
+    "type": "set",
+    "name": "set tmp.found-in-network tmp.ep-available",
+    "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
+    "comments": "",
+    "x": 3203.188331604004,
+    "y": 993.3989963531494,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "e3bdd7fd.7d8fe8",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 2748.17822265625,
+    "y": 1037.7886533737183,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "96a33d9.74471c",
+    "type": "switchNode",
+    "name": "switch tmp.ep-available",
+    "xml": "<switch test='`$tmp.ep-available`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 625.3441162109375,
+    "y": 1170.2329092025757,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "61b02086.d03f9",
+        "6c4d286f.2a00a8"
+      ]
+    ]
+  },
+  {
+    "id": "6c4d286f.2a00a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 808.0109519958496,
+    "y": 1194.5663175582886,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "929ee9e7.521368"
+      ]
+    ]
+  },
+  {
+    "id": "61b02086.d03f9",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 810.8997230529785,
+    "y": 1133.5664157867432,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "856596b.3c40368"
+      ]
+    ]
+  },
+  {
+    "id": "856596b.3c40368",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 947.8997993469238,
+    "y": 1132.4552297592163,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "929ee9e7.521368",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 978.1220397949219,
+    "y": 1192.5662755966187,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "be61dd8a.9e196"
+      ]
+    ]
+  },
+  {
+    "id": "eb0bfad4.778f58",
+    "type": "comment",
+    "name": "GET connection-attachment-ar to store AR data from mdsal",
+    "info": "",
+    "comments": "",
+    "x": 2163.504196166992,
+    "y": 372.504093170166,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "114f8c87.a5aa33",
+    "type": "comment",
+    "name": "Set source end point",
+    "info": "",
+    "comments": "",
+    "x": 602.0040893554688,
+    "y": 602.2541885375977,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "cea5b658.f38fb8",
+    "type": "set",
+    "name": "set tmp.ar.parent-service-instance-id",
+    "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
+    "comments": "",
+    "x": 655.0001678466797,
+    "y": 727.0003328323364,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "5d8dc0c4.ff757",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1033.0001640319824,
+    "y": 776.0003318786621,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6a1bf843.4d25b8"
+      ]
+    ]
+  },
+  {
+    "id": "83b7907.b55937",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1024.8519668579102,
+    "y": 811.0664167404175,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "4f4eb4c7.cc9fdc"
+      ]
+    ]
+  },
+  {
+    "id": "4f4eb4c7.cc9fdc",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
+    "comments": "",
+    "x": 1200.0006523132324,
+    "y": 807.3337669372559,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "6a1bf843.4d25b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1184.0001640319824,
+    "y": 774.0003318786621,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8fc6baf4.1c66d8",
+    "type": "set",
+    "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
+    "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
+    "comments": "",
+    "x": 742.0001602172852,
+    "y": 901.0003061294556,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "ce5d7876.710a68",
+    "type": "comment",
+    "name": "If other EP exists delete from domain controller",
+    "info": "",
+    "comments": "",
+    "x": 676.0000610351562,
+    "y": 1095.0001211166382,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "fd46c38b.b0e06",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "comments": "",
+    "x": 2674.000877380371,
+    "y": 1385.0007133483887,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "ff817e6a.4c262",
+    "type": "get-resource",
+    "name": "get-resource esr-thirdparty-sdnc",
+    "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.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2237.500816345215,
+    "y": 1444.0007133483887,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "f3622c21.50f46",
+        "e431ae5e.58828",
+        "a151b89e.28add8"
+      ]
+    ]
+  },
+  {
+    "id": "f3622c21.50f46",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2476.500816345215,
+    "y": 1397.0007133483887,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "fd46c38b.b0e06"
+      ]
+    ]
+  },
+  {
+    "id": "e431ae5e.58828",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2479.99178314209,
+    "y": 1444.57474899292,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "236bc0bf.99bb6"
+      ]
+    ]
+  },
+  {
+    "id": "a151b89e.28add8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2475.32479095459,
+    "y": 1485.9080619812012,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6adb79b2.e33818"
+      ]
+    ]
+  },
+  {
+    "id": "236bc0bf.99bb6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 2656.5631942749023,
+    "y": 1432.8604850769043,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "6adb79b2.e33818",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 2663.0973472595215,
+    "y": 1481.3472547531128,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "993c0a9c.fa2968",
+    "type": "get-resource",
+    "name": "get-resource pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2187.0009841918945,
+    "y": 1336.000542640686,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "6cbbdc6c.177994",
+        "d6b323fb.dd5df",
+        "691cb9fb.eb1b88"
+      ]
+    ]
+  },
+  {
+    "id": "6cbbdc6c.177994",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2375.0009994506836,
+    "y": 1282.0005350112915,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "f3a2b0cc.a6cd3"
+      ]
+    ]
+  },
+  {
+    "id": "d6b323fb.dd5df",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2380.492046356201,
+    "y": 1324.5744314193726,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "44a433a2.c4cb1c"
+      ]
+    ]
+  },
+  {
+    "id": "691cb9fb.eb1b88",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2366.825054168701,
+    "y": 1362.9077672958374,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "a204db7f.ac39f8"
+      ]
+    ]
+  },
+  {
+    "id": "44a433a2.c4cb1c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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",
+    "comments": "",
+    "x": 2534.063346862793,
+    "y": 1314.8602380752563,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "a204db7f.ac39f8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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",
+    "comments": "",
+    "x": 2530.597526550293,
+    "y": 1354.3470573425293,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "f3a2b0cc.a6cd3",
+    "type": "set",
+    "name": "set tmp.thirdparty-sdnc-id",
+    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 2575.0010147094727,
+    "y": 1277.0005350112915,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "d61e54ea.0473f8",
+    "type": "comment",
+    "name": "get domain controller information",
+    "info": "",
+    "comments": "",
+    "x": 2230.5048904418945,
+    "y": 1305.0045099258423,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "10d17cd1.f30ab3",
+    "type": "execute",
+    "name": "execute RestApiCallNode Delete ethernet Service",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`\" />\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=\"delete\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 2761.001152038574,
+    "y": 1730.000747680664,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "94d88f9c.771f9",
+        "f2badd12.3e9c1"
+      ]
+    ]
+  },
+  {
+    "id": "94d88f9c.771f9",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3107.000801086426,
+    "y": 1714.0007457733154,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "1c7ac915.f6a6b7"
+      ]
+    ]
+  },
+  {
+    "id": "1c7ac915.f6a6b7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3277.0007400512695,
+    "y": 1717.0007457733154,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "73cc424c.c105bc",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+    "comments": "",
+    "x": 3277.000862121582,
+    "y": 1673.0007457733154,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "f2badd12.3e9c1",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3110.0007400512695,
+    "y": 1673.0007457733154,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "73cc424c.c105bc"
+      ]
+    ]
+  },
+  {
+    "id": "4d3c7e74.2037b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 904.7619972229004,
+    "y": 1694.9529141187668,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "9a2c9c7c.b67bf"
+      ]
+    ]
+  },
+  {
+    "id": "9a2c9c7c.b67bf",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"AAI failed\" />\n",
+    "comments": "",
+    "x": 1071.2858772277832,
+    "y": 1706.5719851255417,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "76fdd751.58a9d8",
+    "type": "failure",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 911.8572845458984,
+    "y": 1727.7148817777634,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "9a2c9c7c.b67bf"
+      ]
+    ]
+  },
+  {
+    "id": "4fec1ce6.1b1a34",
+    "type": "comment",
+    "name": "Save Resource to AAI",
+    "info": "",
+    "comments": "",
+    "x": 623.8097114562988,
+    "y": 1677.3023023605347,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "d507ebff.314fd8",
+    "type": "set",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+    "comments": "",
+    "x": 638.5774078369141,
+    "y": 1598.8277835845947,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "9f388371.4f18e",
+    "type": "returnSuccess",
+    "name": "return success",
+    "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",
+    "comments": "",
+    "x": 606.9904899597168,
+    "y": 1759.4435358047485,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "8e1d23f5.d1706",
+    "type": "execute",
+    "name": "execute RestApiCallNode - PUT AR by id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 688.3095092773438,
+    "y": 1506.468557357788,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "e11c7417.4fa658",
+        "64cfcda1.4c2f84",
+        "c55d4506.901118"
+      ]
+    ]
+  },
+  {
+    "id": "e11c7417.4fa658",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 956.9508857727051,
+    "y": 1557.799969099462,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "14bdf473.21930c"
+      ]
+    ]
+  },
+  {
+    "id": "64cfcda1.4c2f84",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 947.9509353637695,
+    "y": 1526.2999948486686,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "14bdf473.21930c"
+      ]
+    ]
+  },
+  {
+    "id": "c55d4506.901118",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 951.7009735107422,
+    "y": 1496.657099723816,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "82c892ac.f910d"
+      ]
+    ]
+  },
+  {
+    "id": "14bdf473.21930c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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 updating md-sal for connection-attachment-allotted-resource\" />\n",
+    "comments": "",
+    "x": 1117.7009735107422,
+    "y": 1527.0500186905265,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "82c892ac.f910d",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1093.3569412231445,
+    "y": 1492.849268913269,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bd5b936a.6f494",
+    "type": "set",
+    "name": "set ar-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />",
+    "comments": "",
+    "x": 588.5231285095215,
+    "y": 1356.8494803905487,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "754f8876.c41b88",
+    "type": "execute",
+    "name": "execute getTime",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 605.8089714050293,
+    "y": 1429.4690780639648,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1fa63937.8805f7",
+    "type": "set",
+    "name": "set allotted-resource-oper-status",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+    "comments": "",
+    "x": 660.796028137207,
+    "y": 1467.4202156066895,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "1ecf912a.ad8d5f",
+    "type": "set",
+    "name": "set model-data",
+    "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
+    "comments": "",
+    "x": 602.3646697998047,
+    "y": 1396.024130821228,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "3d5eb994.20a306",
+    "type": "comment",
+    "name": "Prepare data for allotted-resource addition to MDSAL",
+    "info": "This will add to allotted-resource which is present inside service.",
+    "comments": "",
+    "x": 715.6981315612793,
+    "y": 1317.0240828990936,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "35db93ec.682e9c",
+    "type": "comment",
+    "name": "Add to allotted-resources in mdsal",
+    "info": "",
+    "comments": "",
+    "x": 657.2779579162598,
+    "y": 1284.4373846054077,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "31cf3c93.494fc4",
+    "type": "update",
+    "name": "update AAI allotted-resource",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"PendingDelete\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 650.2539901733398,
+    "y": 1714.7544450759888,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "4d3c7e74.2037b",
+        "76fdd751.58a9d8"
+      ]
+    ]
+  },
+  {
+    "id": "be61dd8a.9e196",
+    "type": "get-resource",
+    "name": "get-resource connectivity",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.service-data.networks.network[0].network-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.connectivity' local-only='false' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1184.0318145751953,
+    "y": 1192.504550933838,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "ec3a781a.b17a88",
+        "13bcbf26.d71d71"
+      ]
+    ]
+  },
+  {
+    "id": "3730ddb4.d493b2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1957.1491241455078,
+    "y": 1389.3446836471558,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "76aabffd.38e",
+        "ddc37a19.aa1838",
+        "993c0a9c.fa2968",
+        "ff817e6a.4c262",
+        "d2c267be.388018",
+        "4ec4550f.fd160c",
+        "767b76a3.973bd8"
+      ]
+    ]
+  },
+  {
+    "id": "2d7c3367.b4917c",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1783.317642211914,
+    "y": 1391.8262071609497,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "3730ddb4.d493b2"
+      ]
+    ]
+  },
+  {
+    "id": "95f1a2bf.0b285",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1405.0315856933594,
+    "y": 1390.004433631897,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "68b3b3fe.7b312c"
+      ]
+    ]
+  },
+  {
+    "id": "68b3b3fe.7b312c",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1617.0315971374512,
+    "y": 1391.004433631897,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "2d7c3367.b4917c"
+      ]
+    ]
+  },
+  {
+    "id": "ddc37a19.aa1838",
+    "type": "set",
+    "name": "set tmp.vpn-name",
+    "xml": "<set>\n<parameter name='tmp.vpn-name' value=\"`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` \" />\n",
+    "comments": "",
+    "x": 2190.0317916870117,
+    "y": 1103.00475025177,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "76aabffd.38e",
+    "type": "execute",
+    "name": "split vpnName to find nodeId",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.vpn-name`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2226.0317459106445,
+    "y": 1204.004117012024,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "78a77003.35ea4",
+        "637ec688.c44a88"
+      ]
+    ]
+  },
+  {
+    "id": "637ec688.c44a88",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2427.031936645508,
+    "y": 1181.0041093826294,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "b87e837.b66ce8"
+      ]
+    ]
+  },
+  {
+    "id": "b87e837.b66ce8",
+    "type": "set",
+    "name": "set tmp.node-id",
+    "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n<parameter name='tmp.actual.vpn-name' value='`$route1[1]`' />\n",
+    "comments": "",
+    "x": 2580.032096862793,
+    "y": 1179.0041103363037,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "857b862a.e6a0b8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 2564.032262802124,
+    "y": 1228.0041122436523,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "78a77003.35ea4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2424.03191947937,
+    "y": 1229.004114151001,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "857b862a.e6a0b8"
+      ]
+    ]
+  },
+  {
+    "id": "ec3a781a.b17a88",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1365.0314140319824,
+    "y": 1227.0001955032349,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "8cc479bc.b82368"
+      ]
+    ]
+  },
+  {
+    "id": "13bcbf26.d71d71",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1367.883144378662,
+    "y": 1154.0664405822754,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "c5f74144.ebbac"
+      ]
+    ]
+  },
+  {
+    "id": "c5f74144.ebbac",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Connectivity resource not found\" />\n    \n",
+    "comments": "",
+    "x": 1510.0319137573242,
+    "y": 1154.3338508605957,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "8cc479bc.b82368",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1367.0314254760742,
+    "y": 1305.000361442566,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "95f1a2bf.0b285"
+      ]
+    ]
+  },
+  {
+    "id": "61d4f147.44641",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 803.3652038574219,
+    "y": 553.5000734329224,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "55776be8.abf844",
+        "2f2bf02.ca60d1"
+      ]
+    ]
+  },
+  {
+    "id": "7bc058aa.42a598",
+    "type": "execute",
+    "name": "get parent-service-data tmp.ar-url-psd",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 657.0314483642578,
+    "y": 762.0003347396851,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7c847f3c.b2ac4",
+    "type": "execute",
+    "name": "execute RestApiCallNode - get-resource parent service data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 724.0314102172852,
+    "y": 797.0004186630249,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "5d8dc0c4.ff757",
+        "83b7907.b55937"
+      ]
+    ]
+  },
+  {
+    "id": "f0fb1a1c.cc2828",
+    "type": "switchNode",
+    "name": "switch mdsal-psd.service-data.provided-allotted-resources_length",
+    "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 740.2155303955078,
+    "y": 971.7182464599609,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "f3fcb7.3cb38348",
+        "31b6e940.d005b6",
+        "998ab047.1d3cb"
+      ]
+    ]
+  },
+  {
+    "id": "d2c267be.388018",
+    "type": "update",
+    "name": "delete AAI vpn-binding",
+    "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpn-name' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 2211.031204223633,
+    "y": 1801.0002889633179,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "e8b749f3.e275f8",
+        "ef20a9a9.f1fb18"
+      ]
+    ]
+  },
+  {
+    "id": "e8b749f3.e275f8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2465.5392112731934,
+    "y": 1781.1987580060959,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "b53766de.89b208"
+      ]
+    ]
+  },
+  {
+    "id": "ef20a9a9.f1fb18",
+    "type": "failure",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2472.6344985961914,
+    "y": 1813.9607256650925,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "b53766de.89b208"
+      ]
+    ]
+  },
+  {
+    "id": "b53766de.89b208",
+    "type": "returnFailure",
+    "name": "return failure",
+    "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=\"AAI failed\" />\n",
+    "comments": "",
+    "x": 2632.063091278076,
+    "y": 1792.8178290128708,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "4ec4550f.fd160c",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2250.7854080200195,
+    "y": 1581.254126548767,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "d144148d.dc75b8",
+        "6622df6c.28bd"
+      ]
+    ]
+  },
+  {
+    "id": "d144148d.dc75b8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2485.7854080200195,
+    "y": 1559.254126548767,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "11df681e.1cd4c8"
+      ]
+    ]
+  },
+  {
+    "id": "6622df6c.28bd",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2478.0354080200195,
+    "y": 1612.8970098495483,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "a07b50ef.81562"
+      ]
+    ]
+  },
+  {
+    "id": "11df681e.1cd4c8",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+    "comments": "",
+    "x": 2639.7854080200195,
+    "y": 1560.254126548767,
+    "z": "f47a0348.da1fc",
+    "wires": []
+  },
+  {
+    "id": "767b76a3.973bd8",
+    "type": "switchNode",
+    "name": "switch prop.sdncRestApi.token_id",
+    "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2257.031126022339,
+    "y": 1686.5312061309814,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "647e08e2.0afec8",
+        "4b8f5cd7.3f8294"
+      ]
+    ]
+  },
+  {
+    "id": "4b8f5cd7.3f8294",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2477.0312519073486,
+    "y": 1726.031084060669,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "10d17cd1.f30ab3"
+      ]
+    ]
+  },
+  {
+    "id": "647e08e2.0afec8",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2483.031373977661,
+    "y": 1662.5310831069946,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "e34fee1b.784d2"
+      ]
+    ]
+  },
+  {
+    "id": "a07b50ef.81562",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2623.0311431884766,
+    "y": 1610.5309600830078,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e34fee1b.784d2",
+    "type": "execute",
+    "name": "execute RestApiCallNode Delete ethernet Service",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`\" />\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=\"delete\"/>\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",
+    "comments": "",
+    "outputs": 1,
+    "x": 2762.03125,
+    "y": 1659.5311279296875,
+    "z": "f47a0348.da1fc",
+    "wires": [
+      [
+        "f2badd12.3e9c1",
+        "94d88f9c.771f9"
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 4ce82b1c..2b20f06e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -265,6 +265,16 @@ value="`$connection-attachment-ar-identifiers.`" />
                     </return>
                 </outcome>
             </save>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id" 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="allotted-resource" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/business/customers/customer/' + $connection-attachment-topology-operation-input.service-information.global-customer-id + '/service-subscriptions/service-subscription/' + $connection-attachment-topology-operation-input.service-information.subscription-service-type + '/service-instances/service-instance/' + $connection-attachment-topology-operation-input.service-information.service-instance-id + '/allotted-resources/allotted-resource/' + $tmp.ar.allotted-resource-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="allotted-resource.id" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ar.allotted-resource-id`" />
+            </save>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
index 98d8bc9e..7fffebd5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
@@ -33,6 +33,7 @@
                 </outcome>
             </get-resource>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index ffd5ee73..db4a18c4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -128,6 +128,7 @@
                                     <parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />
                                 </set>
                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -148,6 +149,7 @@
                                     <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />
                                 </set>
                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index ef9278b9..3e4a32f2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -447,37 +447,62 @@
                                             </set>
                                         </outcome>
                                         <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error executing get token rest api" />
-                                            </return>
+                                            <block></block>
                                         </outcome>
                                     </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                        <parameter name="format" value="json"/>
-                                        <parameter name="httpMethod" value="patch"/>
-                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                            </return>
+                                    <switch test="`$prop.sdncRestApi.token_id`">
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="patch"/>
+                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
                                         </outcome>
-                                        <outcome value='success'>
-                                            <block atomic="true"></block>
+                                        <outcome value='Other'>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="patch"/>
+                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
                                         </outcome>
-                                    </execute>
+                                    </switch>
                                     <set>
                                         <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />
                                     </set>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 4626b3c3..9a334655 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -291,36 +291,60 @@
                                                             </set>
                                                         </outcome>
                                                         <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing get token rest api" />
-                                                            </return>
+                                                            <block></block>
                                                         </outcome>
                                                     </execute>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                                        <parameter name="format" value="json"/>
-                                                        <parameter name="httpMethod" value="delete"/>
-                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
-                                                            </return>
+                                                    <switch test="`$prop.sdncRestApi.token_id`">
+                                                        <outcome value=''>
+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />
+                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                                <parameter name="format" value="json"/>
+                                                                <parameter name="httpMethod" value="delete"/>
+                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                <outcome value='failure'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true"></block>
+                                                                </outcome>
+                                                            </execute>
                                                         </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true"></block>
+                                                        <outcome value='Other'>
+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.actual.vpn-name`" />
+                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                                <parameter name="format" value="json"/>
+                                                                <parameter name="httpMethod" value="delete"/>
+                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                <outcome value='failure'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true"></block>
+                                                                </outcome>
+                                                            </execute>
                                                         </outcome>
-                                                    </execute>
+                                                    </switch>
                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
       key='vpn-binding.vpn-id = $tmp.vpn-name' >
                                                         <outcome value='failure'>
-- 
cgit 1.2.3-korg