From 74c1c3507bbd3194c7bb57e45ffd08428dd280c2 Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Thu, 9 Aug 2018 14:08:39 +0530
Subject: connectivity attachment issue fix

Test issues fixed

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

Former-commit-id: e89a860588e3a094d5cc251dd6992373c2f36ab7
---
 ...I_connection-attachment-topology-operation.json |  396 ++-
 ...otn-attachment-topology-operation-activate.json | 2551 +++++++++-----------
 ..._sotn-attachment-topology-operation-create.json | 1071 ++++----
 ...n-attachment-topology-operation-deactivate.json | 1643 ++++++-------
 ..._sotn-attachment-topology-operation-delete.json |  835 +++----
 ...E-API_validate-connection-attachment-input.json |  708 +++---
 ...PI_connection-attachment-topology-operation.xml |  162 +-
 ...sotn-attachment-topology-operation-activate.xml | 1169 ++++-----
 ...I_sotn-attachment-topology-operation-create.xml |  523 ++--
 ...tn-attachment-topology-operation-deactivate.xml |  771 +++---
 ...I_sotn-attachment-topology-operation-delete.xml |  358 +--
 ...CE-API_validate-connection-attachment-input.xml |  470 ++--
 12 files changed, 5149 insertions(+), 5508 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
index 77d885af..7ec149ae 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "b2143086.a417",
+    "id": "7040c3da.af1dec",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109.03125,
-    "y": 37.03125,
-    "z": "efb71132.eba6e",
+    "x": 110.00390625,
+    "y": 64.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "7e88a37a.69419c"
+        "2925fee5.4b2612"
       ]
     ]
   },
   {
-    "id": "7e88a37a.69419c",
+    "id": "2925fee5.4b2612",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,515 +22,491 @@
     "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": 247.03126525878906,
-    "y": 98.03124809265137,
-    "z": "efb71132.eba6e",
+    "x": 248.00392150878906,
+    "y": 125.00390434265137,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "90bc847a.1e90f8"
+        "b82edbfb.46a2a8"
       ]
     ]
   },
   {
-    "id": "90bc847a.1e90f8",
+    "id": "b82edbfb.46a2a8",
     "type": "method",
     "name": "connection-attachment-topology-operation",
     "xml": "<method rpc='connection-attachment-topology-operation' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 282.0312805175781,
-    "y": 146.03127670288086,
-    "z": "efb71132.eba6e",
+    "x": 283.0039367675781,
+    "y": 173.00393295288086,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "bf0dea50.c6f6f8"
+        "a9203dbc.c4a92"
       ]
     ]
   },
   {
-    "id": "bf0dea50.c6f6f8",
+    "id": "a9203dbc.c4a92",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 207.03125,
-    "y": 224.03124237060547,
-    "z": "efb71132.eba6e",
+    "x": 208.00390625,
+    "y": 251.00389862060547,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "4b652dbe.7deec4",
-        "976e09a7.a23c78",
-        "d692689.8b14098",
-        "f2e8c4be.f6edf8"
+        "d28295b8.2c2758",
+        "7f7eb3b.b67394c",
+        "779cd391.117a2c",
+        "3ccb66ff.5dacfa"
       ]
     ]
   },
   {
-    "id": "4b652dbe.7deec4",
+    "id": "d28295b8.2c2758",
     "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": 421.40042877197266,
-    "y": 836.8741173744202,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 422.37308502197266,
+    "y": 863.8467736244202,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "976e09a7.a23c78",
+    "id": "7f7eb3b.b67394c",
     "type": "switchNode",
     "name": "switch svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 428.0311737060547,
-    "y": 383.44496059417725,
-    "z": "efb71132.eba6e",
+    "x": 429.0038299560547,
+    "y": 410.41761684417725,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "7df40438.8d552c",
-        "854b6002.a361e",
-        "d0a5f285.16e91",
-        "a7c210e.8aeb8f",
-        "d7a3669.7308f98"
+        "bb04a1a3.bc9cc",
+        "e1cc92c7.25fd7",
+        "cf940d5c.e7317",
+        "935024a.1180cd8",
+        "50ef3ecb.f8e1d"
       ]
     ]
   },
   {
-    "id": "d692689.8b14098",
+    "id": "779cd391.117a2c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-connection-attachment-input",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-connection-attachment-input' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 619.6026916503906,
-    "y": 204.01640129089355,
-    "z": "efb71132.eba6e",
+    "x": 620.5753479003906,
+    "y": 230.98905754089355,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "7df40438.8d552c",
+    "id": "bb04a1a3.bc9cc",
     "type": "other",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 643.3169174194336,
-    "y": 392.58784008026123,
-    "z": "efb71132.eba6e",
+    "x": 644.2895736694336,
+    "y": 419.56049633026123,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "c747bb59.396bf8"
+        "f86d00f8.fcf59"
       ]
     ]
   },
   {
-    "id": "854b6002.a361e",
+    "id": "e1cc92c7.25fd7",
     "type": "other",
-    "name": "deactivate",
-    "xml": "<outcome value='deactivate'>\n",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 653.3169784545898,
-    "y": 673.5880031585693,
-    "z": "efb71132.eba6e",
+    "x": 654.2896347045898,
+    "y": 700.5606594085693,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "5f2c7e54.e5319"
+        "7a0372ab.33be4c"
       ]
     ]
   },
   {
-    "id": "d0a5f285.16e91",
+    "id": "cf940d5c.e7317",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.6502876281738,
-    "y": 758.9214267730713,
-    "z": "efb71132.eba6e",
+    "x": 643.6229438781738,
+    "y": 785.8940830230713,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "63b93e5c.700f6"
+        "903586f6.489208"
       ]
     ]
   },
   {
-    "id": "63b93e5c.700f6",
+    "id": "903586f6.489208",
     "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=\"sdnc-request-header.svc-action is invalid\" />\n",
     "comments": "",
-    "x": 824.6502838134766,
-    "y": 757.9214363098145,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 825.6229400634766,
+    "y": 784.8940925598145,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "f2e8c4be.f6edf8",
+    "id": "3ccb66ff.5dacfa",
     "type": "set",
     "name": "Set final indicator to Y",
     "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
     "comments": "",
-    "x": 440.4281234741211,
-    "y": 796.0324559211731,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 441.4007797241211,
+    "y": 823.0051121711731,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "a7c210e.8aeb8f",
+    "id": "935024a.1180cd8",
     "type": "other",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.5576133728027,
-    "y": 257.19257259368896,
-    "z": "efb71132.eba6e",
+    "x": 643.5302696228027,
+    "y": 284.16522884368896,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "8d1575e7.3d39d8"
+        "76e064e5.59ef8c"
       ]
     ]
   },
   {
-    "id": "d7a3669.7308f98",
+    "id": "50ef3ecb.f8e1d",
     "type": "other",
-    "name": "delete",
-    "xml": "<outcome value='delete'>\n",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 647.8909645080566,
-    "y": 533.8593759536743,
-    "z": "efb71132.eba6e",
+    "x": 648.8636207580566,
+    "y": 560.8320322036743,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "347f7912.887506"
+        "c2dd69d2.09a368"
       ]
     ]
   },
   {
-    "id": "380d46d2.a08ada",
+    "id": "381cd5e6.60b05a",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-create",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-create' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1537.1175537109375,
-    "y": 208.57203483581543,
-    "z": "efb71132.eba6e",
+    "x": 1538.0902099609375,
+    "y": 235.54469108581543,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "8d1575e7.3d39d8",
+    "id": "76e064e5.59ef8c",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 833.5313034057617,
-    "y": 256.0312566757202,
-    "z": "efb71132.eba6e",
+    "x": 834.5039596557617,
+    "y": 283.0039129257202,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "b4498aac.7cb2b8",
-        "ed77a730.056558"
+        "73303973.3b9048",
+        "7c8a6efc.7a43c"
       ]
     ]
   },
   {
-    "id": "b4498aac.7cb2b8",
+    "id": "73303973.3b9048",
     "type": "outcome",
     "name": "CreateSOTNAttachmentInstance",
     "xml": "<outcome value='CreateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1088.864517211914,
-    "y": 208.03106307983398,
-    "z": "efb71132.eba6e",
+    "x": 1089.837173461914,
+    "y": 235.00371932983398,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "380d46d2.a08ada"
+        "381cd5e6.60b05a"
       ]
     ]
   },
   {
-    "id": "ed77a730.056558",
+    "id": "7c8a6efc.7a43c",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1018.8646240234375,
-    "y": 299.69779205322266,
-    "z": "efb71132.eba6e",
+    "x": 1019.8372802734375,
+    "y": 326.67044830322266,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "1b79383c.71b538"
+        "2e04dda8.211e22"
       ]
     ]
   },
   {
-    "id": "1b79383c.71b538",
+    "id": "2e04dda8.211e22",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1184.5312881469727,
-    "y": 300.03125762939453,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1185.5039443969727,
+    "y": 327.00391387939453,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "b97ace55.086d3",
+    "id": "c3ec8e4c.42bba",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1546.5312957763672,
-    "y": 343.03125953674316,
-    "z": "efb71132.eba6e",
+    "x": 1547.5039520263672,
+    "y": 370.00391578674316,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "a6785aab.86f948",
+    "id": "e555e69b.d6dab8",
     "type": "outcome",
     "name": "ActivateSOTNAttachmentInstance",
     "xml": "<outcome value='ActivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1096.278335571289,
-    "y": 345.4902935028076,
-    "z": "efb71132.eba6e",
+    "x": 1097.250991821289,
+    "y": 372.4629497528076,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "b97ace55.086d3"
+        "c3ec8e4c.42bba"
       ]
     ]
   },
   {
-    "id": "d100865f.7e59f8",
+    "id": "5c941c7c.d135c4",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1026.2784423828125,
-    "y": 437.1570224761963,
-    "z": "efb71132.eba6e",
+    "x": 1027.2510986328125,
+    "y": 464.1296787261963,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "19062ead.ade691"
+        "b0deba38.7b5228"
       ]
     ]
   },
   {
-    "id": "bbd40a3d.52a218",
+    "id": "874a4de5.20f7a",
     "type": "outcome",
     "name": "DeactivateSOTNAttachmentInstance",
     "xml": "<outcome value='DeactivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1115.8645477294922,
-    "y": 484.0310802459717,
-    "z": "efb71132.eba6e",
+    "x": 1116.8372039794922,
+    "y": 511.0037364959717,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "cdb50b2f.8ff328"
+        "4329778c.cafb48"
       ]
     ]
   },
   {
-    "id": "6647d681.d75a78",
+    "id": "8f441f1b.ab4bb",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1030.8645706176758,
-    "y": 575.6977853775024,
-    "z": "efb71132.eba6e",
+    "x": 1031.8372268676758,
+    "y": 602.6704416275024,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "dab4a1b3.5c9b3"
+        "5242314d.7fd95"
       ]
     ]
   },
   {
-    "id": "cdb50b2f.8ff328",
+    "id": "4329778c.cafb48",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-deactivate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1574.5313720703125,
-    "y": 484.03126335144043,
-    "z": "efb71132.eba6e",
+    "x": 1575.5040283203125,
+    "y": 511.00391960144043,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "8c01d720.070a78",
+    "id": "18c3914d.1fd05f",
     "type": "outcome",
     "name": "DeleteSOTNAttachmentInstance",
     "xml": "<outcome value='DeleteSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1104.8644638061523,
-    "y": 625.0310564041138,
-    "z": "efb71132.eba6e",
+    "x": 1105.8371200561523,
+    "y": 652.0037126541138,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "58c79286.6e607c"
+        "1d1f5f1c.4ba391"
       ]
     ]
   },
   {
-    "id": "aa83e7c.d9f1218",
+    "id": "a82f11b4.25a05",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1034.8645706176758,
-    "y": 716.6977853775024,
-    "z": "efb71132.eba6e",
+    "x": 1035.8372268676758,
+    "y": 743.6704416275024,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "4e0c491c.1e9da8"
+        "c42475bd.4b30d8"
       ]
     ]
   },
   {
-    "id": "58c79286.6e607c",
+    "id": "1d1f5f1c.4ba391",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-delete",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-delete' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.5313415527344,
-    "y": 626.0312671661377,
-    "z": "efb71132.eba6e",
+    "x": 1561.5039978027344,
+    "y": 653.0039234161377,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "c747bb59.396bf8",
+    "id": "f86d00f8.fcf59",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 831.0313110351562,
-    "y": 397.03126335144043,
-    "z": "efb71132.eba6e",
+    "x": 832.0039672851562,
+    "y": 424.00391960144043,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "a6785aab.86f948",
-        "d100865f.7e59f8"
+        "e555e69b.d6dab8",
+        "5c941c7c.d135c4"
       ]
     ]
   },
   {
-    "id": "347f7912.887506",
+    "id": "c2dd69d2.09a368",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 845.03125,
-    "y": 538.03125,
-    "z": "efb71132.eba6e",
+    "x": 846.00390625,
+    "y": 565.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "bbd40a3d.52a218",
-        "6647d681.d75a78"
+        "874a4de5.20f7a",
+        "8f441f1b.ab4bb"
       ]
     ]
   },
   {
-    "id": "5f2c7e54.e5319",
+    "id": "7a0372ab.33be4c",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 848.03125,
-    "y": 673.03125,
-    "z": "efb71132.eba6e",
+    "x": 849.00390625,
+    "y": 700.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "8c01d720.070a78",
-        "aa83e7c.d9f1218"
+        "18c3914d.1fd05f",
+        "a82f11b4.25a05"
       ]
     ]
   },
   {
-    "id": "19062ead.ade691",
+    "id": "b0deba38.7b5228",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1190.03125,
-    "y": 437.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1191.00390625,
+    "y": 464.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "dab4a1b3.5c9b3",
+    "id": "5242314d.7fd95",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1198.03125,
-    "y": 577.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1199.00390625,
+    "y": 604.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "4e0c491c.1e9da8",
+    "id": "c42475bd.4b30d8",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1203.03125,
-    "y": 716.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1204.00390625,
+    "y": 743.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index 5729a236..47601af5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "13403d5.5be54c3",
+    "id": "cbe4a9ee.16a0f8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 112.00390625,
-    "y": 46.00390625,
-    "z": "4f77841b.f6c90c",
+    "x": 129.00390625,
+    "y": 47.00390625,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "8694bff7.45011"
+        "e13e73c3.adb19"
       ]
     ]
   },
   {
-    "id": "8694bff7.45011",
+    "id": "e13e73c3.adb19",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,3045 +22,2872 @@
     "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": 324.00391006469727,
-    "y": 118.0039234161377,
-    "z": "4f77841b.f6c90c",
+    "x": 341.00391006469727,
+    "y": 119.0039234161377,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "ce5f4d71.3c80b"
+        "5fa2576a.526658"
       ]
     ]
   },
   {
-    "id": "ce5f4d71.3c80b",
+    "id": "5fa2576a.526658",
     "type": "method",
     "name": "sotn-attachment-topology-operation-activate",
     "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 312.0040283203125,
-    "y": 206.00390625,
-    "z": "4f77841b.f6c90c",
+    "x": 329.0040283203125,
+    "y": 207.00390625,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "e7e7b5c7.7cb0c8"
+        "91f5fd5b.cb45c"
       ]
     ]
   },
   {
-    "id": "e7e7b5c7.7cb0c8",
+    "id": "91f5fd5b.cb45c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 328.0040283203125,
-    "y": 761.0041508674622,
-    "z": "4f77841b.f6c90c",
+    "x": 345.0040283203125,
+    "y": 762.0041508674622,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "581b91b6.06ff3",
-        "680895fb.4f588c",
-        "dc05cef1.a51f5",
-        "89ef32f1.d5d63",
-        "7184e2e7.8c461c",
-        "f440893f.3eb748",
-        "80cf693a.7220c8",
-        "cab0e236.de21f",
-        "84e0eeac.a2ba4",
-        "602ccaa6.5c1754",
-        "85ce847d.6d7528",
-        "447e9068.877d",
-        "4b7801cc.5bfc5",
-        "195a1754.387c79",
-        "17bafb78.38c045",
-        "69a30b87.057684",
-        "a26aed10.bae5b",
-        "4c5d18d9.d86fb8",
-        "bc43d14.b5aca3"
+        "f796ddaa.da23c",
+        "d7cfeb18.ac7528",
+        "b6393afd.3cacd8",
+        "81c5733e.5f25d",
+        "1053c083.232fef",
+        "42a877ee.39df08",
+        "d3f500c4.1bfb3",
+        "aa223239.c5978",
+        "44848e46.5ebac",
+        "b29f5799.241a78",
+        "3637e175.005c6e",
+        "295602b3.df648e",
+        "6a3ffb44.1e9004",
+        "6bb92832.c7ba68",
+        "1605273a.149319",
+        "93c61c2f.6bcfd",
+        "eba0b0a5.90799",
+        "e1d773b9.aec52",
+        "8f7266fc.c45038",
+        "5e07c169.5398c"
       ]
     ]
   },
   {
-    "id": "581b91b6.06ff3",
+    "id": "f796ddaa.da23c",
     "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",
+    "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": 724.9974670410156,
-    "y": 159.9973931312561,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 741.9974670410156,
+    "y": 160.9973931312561,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "c2f92da0.ae67f",
+    "id": "84a283be.00d5",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 753.9577789306641,
-    "y": 124.02918910980225,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 770.9577789306641,
+    "y": 125.02918910980225,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "680895fb.4f588c",
+    "id": "d7cfeb18.ac7528",
     "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": 678.9974060058594,
-    "y": 252.99739837646484,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 695.9974060058594,
+    "y": 253.99739837646484,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "cab0e236.de21f",
+    "id": "1053c083.232fef",
     "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": 685.2592964172363,
-    "y": 340.6641273498535,
-    "z": "4f77841b.f6c90c",
+    "x": 702.2592964172363,
+    "y": 341.6641273498535,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "dc05cef1.a51f5",
+    "id": "b6393afd.3cacd8",
     "type": "execute",
-    "name": "generate allotted-resource url",
+    "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": 717.2593231201172,
-    "y": 428.66410875320435,
-    "z": "4f77841b.f6c90c",
+    "x": 749.2593536376953,
+    "y": 429.6641311645508,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
-    ]
-  },
-  {
-    "id": "89ef32f1.d5d63",
-    "type": "get-resource",
-    "name": "get-resource connection-attachment-allotted-resource",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 787.9974212646484,
-    "y": 518.77516746521,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      [
-        "c4c666a0.dc3b68",
-        "2a74b364.08117c"
-      ]
+      []
     ]
   },
   {
-    "id": "74acb38d.a8df3c",
+    "id": "611b176c.616988",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 794.8122177124023,
-    "y": 490.5424861907959,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 795.8122863769531,
+    "y": 560.5425653457642,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "f5129fcf.6a5ca",
+    "id": "eec7a472.d0ac68",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 732.9974365234375,
-    "y": 219.997407913208,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 749.9974365234375,
+    "y": 220.997407913208,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d590f72a.b09d08",
+    "id": "5ba07193.a939c",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 750.9974021911621,
-    "y": 305.8862886428833,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 767.9974021911621,
+    "y": 306.8862886428833,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "609f412.aec83c",
+    "id": "25108569.01c11a",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 776.9974212646484,
-    "y": 392.8862476348877,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 793.9974212646484,
+    "y": 393.8862476348877,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "c4c666a0.dc3b68",
+    "id": "5268ad10.1fbc94",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1087.6706237792969,
-    "y": 504.00389862060547,
-    "z": "4f77841b.f6c90c",
+    "x": 1255.6706981658936,
+    "y": 578.0038909912109,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "2a674d20.0005d2"
+        "1b9b3a1f.4ecdd6"
       ]
     ]
   },
   {
-    "id": "2a674d20.0005d2",
+    "id": "1b9b3a1f.4ecdd6",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1256.6706275939941,
-    "y": 502.50379943847656,
-    "z": "4f77841b.f6c90c",
+    "x": 1399.6707763671875,
+    "y": 535.5038089752197,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "801d5833.48d068"
+        "b1843433.376208"
       ]
     ]
   },
   {
-    "id": "801d5833.48d068",
+    "id": "b1843433.376208",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1467.5278701782227,
-    "y": 502.12292861938477,
-    "z": "4f77841b.f6c90c",
+    "x": 1568.5282001495361,
+    "y": 533.1229801177979,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "eb4c62e2.ed59e",
-        "e1cf5942.513c08"
+        "72d20a43.d9be64",
+        "eb9d8f14.be82"
       ]
     ]
   },
   {
-    "id": "eb4c62e2.ed59e",
+    "id": "72d20a43.d9be64",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1656.8611755371094,
-    "y": 502.12288665771484,
-    "z": "4f77841b.f6c90c",
+    "x": 1723.8613357543945,
+    "y": 505.1228952407837,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "6ded2c0c.68e914"
+        "bb2299d5.286418"
       ]
     ]
   },
   {
-    "id": "6ded2c0c.68e914",
+    "id": "bb2299d5.286418",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1841.3850650787354,
-    "y": 499.027720451355,
-    "z": "4f77841b.f6c90c",
+    "x": 1882.385139465332,
+    "y": 503.02774238586426,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "f931a889.3afae8",
-        "bd538141.56707",
-        "57b77b8c.0f7844"
+        "5775f1db.84903",
+        "246f7da0.0df1c2",
+        "af0aec90.73323"
       ]
     ]
   },
   {
-    "id": "482ef87f.84eaa8",
+    "id": "5facd3b6.9153ec",
     "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",
+    "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": 1800.5228652954102,
-    "y": 580.0699520111084,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1822.5230712890625,
+    "y": 610.0699768066406,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "2a74b364.08117c",
+    "id": "ffb50ed4.11c7e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1079.5224266052246,
-    "y": 539.0699834823608,
-    "z": "4f77841b.f6c90c",
+    "x": 1247.5225009918213,
+    "y": 613.0699758529663,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "ab1859dd.20d8a8"
+        "8996743b.6d4188"
       ]
     ]
   },
   {
-    "id": "ab1859dd.20d8a8",
+    "id": "8996743b.6d4188",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1259.5223770141602,
-    "y": 539.7365341186523,
-    "z": "4f77841b.f6c90c",
+    "x": 1427.5224514007568,
+    "y": 613.7365264892578,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "482ef87f.84eaa8"
+        "5facd3b6.9153ec"
       ]
     ]
   },
   {
-    "id": "e1cf5942.513c08",
+    "id": "eb9d8f14.be82",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1645.1891288757324,
-    "y": 539.4032468795776,
-    "z": "4f77841b.f6c90c",
+    "x": 1715.189338684082,
+    "y": 564.4032697677612,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "482ef87f.84eaa8"
+        "5facd3b6.9153ec"
       ]
     ]
   },
   {
-    "id": "f931a889.3afae8",
+    "id": "5775f1db.84903",
     "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.4485473632812,
-    "y": 468.0039601325989,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2129.4485931396484,
+    "y": 476.00399446487427,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "57b77b8c.0f7844",
+    "id": "af0aec90.73323",
     "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": 2143.4485778808594,
-    "y": 541.4324626922607,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2063.4486236572266,
+    "y": 549.4324970245361,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "bd538141.56707",
+    "id": "246f7da0.0df1c2",
     "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.448356628418,
-    "y": 507.00389671325684,
-    "z": "4f77841b.f6c90c",
+    "x": 2073.448402404785,
+    "y": 515.0039310455322,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "dff36ce6.7bfdb",
-        "68d26983.d39818"
+        "9948e837.465828",
+        "ac517970.6daf78"
       ]
     ]
   },
   {
-    "id": "dff36ce6.7bfdb",
+    "id": "9948e837.465828",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2389.048439025879,
-    "y": 501.0039277076721,
-    "z": "4f77841b.f6c90c",
+    "x": 2309.048484802246,
+    "y": 509.0039620399475,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "a20d7036.b7b91"
+        "d4094486.c3a6e8"
       ]
     ]
   },
   {
-    "id": "68d26983.d39818",
+    "id": "ac517970.6daf78",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2382.7628784179688,
-    "y": 540.432535648346,
-    "z": "4f77841b.f6c90c",
+    "x": 2302.762924194336,
+    "y": 548.4325699806213,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "95ec04c5.68c058"
+        "757a486d.390608"
       ]
     ]
   },
   {
-    "id": "a20d7036.b7b91",
+    "id": "d4094486.c3a6e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2603.518955230713,
-    "y": 502.37956190109253,
-    "z": "4f77841b.f6c90c",
+    "x": 2467.519157409668,
+    "y": 509.37961769104004,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "95ec04c5.68c058",
+    "id": "757a486d.390608",
     "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": 2622.6706581115723,
-    "y": 543.0039258003235,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2478.670738220215,
+    "y": 547.0039691925049,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "a6cc9265.33dd9",
+    "id": "d09e7753.a74cd8",
     "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
+    "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": 975.3069458007812,
-    "y": 608.4974617958069,
-    "z": "4f77841b.f6c90c",
+    "x": 966.306957244873,
+    "y": 660.4975109100342,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "84e0eeac.a2ba4",
+    "id": "42a877ee.39df08",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 657.3130226135254,
-    "y": 608.5037484169006,
-    "z": "4f77841b.f6c90c",
+    "x": 660.3130569458008,
+    "y": 661.5038814544678,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "a6cc9265.33dd9"
+        "d09e7753.a74cd8"
       ]
     ]
   },
   {
-    "id": "7184e2e7.8c461c",
-    "type": "get-resource",
-    "name": "get-resource parent-service-data",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 722.0043334960938,
-    "y": 750.5355229377747,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      [
-        "1665d4d8.fb3cab",
-        "7f1aaa67.966654"
-      ]
-    ]
-  },
-  {
-    "id": "2d977877.2cdd28",
+    "id": "e91124de.b8d7d8",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 842.0042724609375,
-    "y": 679.5354619026184,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 848.00439453125,
+    "y": 706.5356588363647,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "413accea.8047d4",
+    "id": "cfe58f57.1b13e",
     "type": "for",
-    "name": "for pidx..mdsal-psd.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "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": 1731.1887531280518,
-    "y": 918.0080151557922,
-    "z": "4f77841b.f6c90c",
+    "x": 1739.1891021728516,
+    "y": 859.0081362724304,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "bf28fd20.e4d9d"
+        "b90499b4.5bff18"
       ]
     ]
   },
   {
-    "id": "f440893f.3eb748",
+    "id": "81c5733e.5f25d",
     "type": "switchNode",
-    "name": "switch mdsal-psd.provided-allotted-resources_length",
-    "xml": "<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\n",
+    "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": 788.1881103515625,
-    "y": 894.7219853401184,
-    "z": "4f77841b.f6c90c",
+    "x": 823.1881256103516,
+    "y": 966.7221727371216,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d800a1f4.f7982",
-        "d253364d.d38c98",
-        "2dc2ac81.8fbcc4"
+        "2b5852f4.1574ce",
+        "8b23ecf0.b4c98",
+        "2dc5a41e.bad62c"
       ]
     ]
   },
   {
-    "id": "d800a1f4.f7982",
+    "id": "2b5852f4.1574ce",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1120.3309326171875,
-    "y": 1171.5794072151184,
-    "z": "4f77841b.f6c90c",
+    "x": 1151.3311462402344,
+    "y": 1039.5794467926025,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "c302abb6.eb05c8"
+        "4362d0c4.f5cb7"
       ]
     ]
   },
   {
-    "id": "c4d4c7bb.632948",
+    "id": "3bb83710.9a5ab8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1314.4583415985107,
-    "y": 912.705427646637,
-    "z": "4f77841b.f6c90c",
+    "x": 1335.458408355713,
+    "y": 898.7054557800293,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "413accea.8047d4",
-        "ce0b3f4a.08eea"
+        "cfe58f57.1b13e",
+        "44aafa72.840b94"
       ]
     ]
   },
   {
-    "id": "bf28fd20.e4d9d",
+    "id": "b90499b4.5bff18",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "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": 2166.3001537323,
-    "y": 918.0079121589661,
-    "z": "4f77841b.f6c90c",
+    "x": 2179.3004302978516,
+    "y": 856.0079383850098,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "1a1bdd33.763073",
-        "f9268b46.a58948"
+        "d9f6094c.60f3c8",
+        "cb859d5.2b35e6"
       ]
     ]
   },
   {
-    "id": "1a1bdd33.763073",
+    "id": "d9f6094c.60f3c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2375.1103801727295,
-    "y": 890.4724020957947,
-    "z": "4f77841b.f6c90c",
+    "x": 2352.1106452941895,
+    "y": 827.4725532531738,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "c5aa7e99.1a51b"
+        "8ae27c1b.bd8dc"
       ]
     ]
   },
   {
-    "id": "9c7d5f29.63bbc",
+    "id": "303a5029.c6676",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2554.8710765838623,
-    "y": 954.329580783844,
-    "z": "4f77841b.f6c90c",
+    "x": 2500.8711166381836,
+    "y": 884.3296403884888,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "dc636dab.29589",
-        "1d4567ac.71fcc8"
+        "da88cefe.fe269"
       ]
     ]
   },
   {
-    "id": "dc636dab.29589",
+    "id": "da88cefe.fe269",
     "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.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
+    "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": 2811.728582382202,
-    "y": 928.9010949134827,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2735.728542327881,
+    "y": 882.9011726379395,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "1d4567ac.71fcc8",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2722.5893001556396,
-    "y": 975.6571106910706,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "b1ecb95e.fe19d8",
+    "id": "eb542676.9f39a8",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 777.966552734375,
-    "y": 828.8967900276184,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 770.9665641784668,
+    "y": 871.8968677520752,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d253364d.d38c98",
+    "id": "8b23ecf0.b4c98",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1131.9833793640137,
-    "y": 1042.6811718940735,
-    "z": "4f77841b.f6c90c",
+    "x": 1165.9836158752441,
+    "y": 978.6811304092407,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "72798bd.8ed1174"
+        "eb826fe2.5c753"
       ]
     ]
   },
   {
-    "id": "c302abb6.eb05c8",
+    "id": "4362d0c4.f5cb7",
     "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",
+    "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": 1292.9832763671875,
-    "y": 1170.68114900589,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1310.9834938049316,
+    "y": 1038.68137550354,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "2dc2ac81.8fbcc4",
+    "id": "2dc5a41e.bad62c",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1139.983362197876,
-    "y": 913.6811280250549,
-    "z": "4f77841b.f6c90c",
+    "x": 1160.9834289550781,
+    "y": 899.6811561584473,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "c4d4c7bb.632948"
+        "3bb83710.9a5ab8"
       ]
     ]
   },
   {
-    "id": "c5aa7e99.1a51b",
+    "id": "8ae27c1b.bd8dc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2533.0945949554443,
-    "y": 889.6811451911926,
-    "z": "4f77841b.f6c90c",
+    "x": 2510.0948600769043,
+    "y": 826.6812963485718,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "f9268b46.a58948",
+    "id": "cb859d5.2b35e6",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2374.0945949554443,
-    "y": 952.6811451911926,
-    "z": "4f77841b.f6c90c",
+    "x": 2359.0945014953613,
+    "y": 883.6811561584473,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "9c7d5f29.63bbc"
+        "303a5029.c6676"
       ]
     ]
   },
   {
-    "id": "ce0b3f4a.08eea",
+    "id": "44aafa72.840b94",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.9832668304443,
-    "y": 989.4589009284973,
-    "z": "4f77841b.f6c90c",
+    "x": 1547.9834060668945,
+    "y": 952.4589738845825,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "e09e23ee.bea8f"
+        "753da27d.40afec"
       ]
     ]
   },
   {
-    "id": "e09e23ee.bea8f",
+    "id": "753da27d.40afec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.9833126068115,
-    "y": 988.5700707435608,
-    "z": "4f77841b.f6c90c",
+    "x": 1718.98344039917,
+    "y": 953.5701951980591,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "8dfd0c85.a915"
+        "15dd4c54.90cd64"
       ]
     ]
   },
   {
-    "id": "8dfd0c85.a915",
+    "id": "15dd4c54.90cd64",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1973.9833431243896,
-    "y": 988.5701203346252,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      [
-        "c01e9fb3.005a4"
-      ]
-    ]
-  },
-  {
-    "id": "c01e9fb3.005a4",
-    "type": "get-resource",
-    "name": "get-resource provided-ar.allotted-resource",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >",
-    "comments": "",
-    "outputs": 1,
-    "x": 2279.4276962280273,
-    "y": 1040.5701661109924,
-    "z": "4f77841b.f6c90c",
+    "x": 1867.9835357666016,
+    "y": 953.5701942443848,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "cdcbe6d0.564cd8",
-        "d4c31f68.30c06"
+        "2865c930.441376",
+        "36209682.cdfdca"
       ]
     ]
   },
   {
-    "id": "cdcbe6d0.564cd8",
+    "id": "2877490b.8d1876",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2579.100898742676,
-    "y": 1025.798897266388,
-    "z": "4f77841b.f6c90c",
+    "x": 2614.101360321045,
+    "y": 969.7990484237671,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "a8542804.b5e6c8"
+        "2c4d90a6.77e83"
       ]
     ]
   },
   {
-    "id": "d4c31f68.30c06",
+    "id": "bf4a739d.0a26c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2570.9527015686035,
-    "y": 1060.8649821281433,
-    "z": "4f77841b.f6c90c",
+    "x": 2605.9531631469727,
+    "y": 1004.8651332855225,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "7d0763b3.444adc"
+        "7b79fb1a.832b54"
       ]
     ]
   },
   {
-    "id": "4f1efc93.85dab4",
+    "id": "24a003e8.d381ac",
     "type": "switchNode",
-    "name": "switch mdsal-psd.networks_length",
-    "xml": "<switch test='`$mdsal-psd.networks.network_length`'>\n",
+    "name": "switch mdsal-psd.service-data.networks_length",
+    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1558.3167724609375,
-    "y": 1141.9036870002747,
-    "z": "4f77841b.f6c90c",
+    "x": 1611.316909790039,
+    "y": 1053.903814315796,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "6774f061.befc3",
-        "82b7323.6fb02d"
+        "1aeaa906.662367",
+        "d808e760.0f46c8"
       ]
     ]
   },
   {
-    "id": "82b7323.6fb02d",
+    "id": "d808e760.0f46c8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1837.316650390625,
-    "y": 1151.7924809455872,
-    "z": "4f77841b.f6c90c",
+    "x": 1875.3167572021484,
+    "y": 1033.7925605773926,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "90c3e5fe.809838"
+        "e18d77e0.ca5578"
       ]
     ]
   },
   {
-    "id": "6774f061.befc3",
+    "id": "1aeaa906.662367",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1831.3167724609375,
-    "y": 1211.7924809455872,
-    "z": "4f77841b.f6c90c",
+    "x": 1865.3168182373047,
+    "y": 1081.792531967163,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "f2dc069d.22e408"
+        "d8d07b23.4c08f8"
       ]
     ]
   },
   {
-    "id": "f2dc069d.22e408",
+    "id": "d8d07b23.4c08f8",
     "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": 1987.9691162109375,
-    "y": 1212.8942875862122,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2003.9691619873047,
+    "y": 1083.894292831421,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "7296fdef.71a454",
+    "id": "3516f8ea.4360d8",
     "type": "set",
     "name": "set tmp.network.",
-    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />\n",
+    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n",
     "comments": "",
-    "x": 2284.7614822387695,
-    "y": 1135.7926478385925,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2236.761615753174,
+    "y": 1034.792730331421,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "72798bd.8ed1174",
+    "id": "eb826fe2.5c753",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1304.427734375,
-    "y": 1043.792419910431,
-    "z": "4f77841b.f6c90c",
+    "x": 1333.4279251098633,
+    "y": 977.7923974990845,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "4f1efc93.85dab4"
+        "24a003e8.d381ac"
       ]
     ]
   },
   {
-    "id": "90c3e5fe.809838",
+    "id": "e18d77e0.ca5578",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2029.0943603515625,
-    "y": 1154.7923588752747,
-    "z": "4f77841b.f6c90c",
+    "x": 2034.0945281982422,
+    "y": 1036.7923946380615,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "7296fdef.71a454",
-        "f71acaf7.a5e418"
+        "3516f8ea.4360d8",
+        "fa997652.5fc978"
       ]
     ]
   },
   {
-    "id": "f71acaf7.a5e418",
+    "id": "fa997652.5fc978",
     "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": 2446.0944900512695,
-    "y": 1202.79243516922,
-    "z": "4f77841b.f6c90c",
+    "x": 2397.094566345215,
+    "y": 1082.7925491333008,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "bef42353.ac417"
+        "f89cda47.d902a8"
       ]
     ]
   },
   {
-    "id": "bef42353.ac417",
+    "id": "f89cda47.d902a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2817.64990234375,
-    "y": 1235.7923588752747,
-    "z": "4f77841b.f6c90c",
+    "x": 2443.650634765625,
+    "y": 1313.7923583984375,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "7c3ef39d.83f20c",
-        "18cbc1f3.8102ae",
-        "d4ff5a6.b2eb6a8",
-        "42092cc3.b6ed84",
-        "297544d9.6ec98c",
-        "66d53edd.cdef9",
-        "b4d50d62.6f88a",
-        "64cab1cd.5d443",
-        "10c9f83a.94e8c8",
-        "17843ccd.4f45d3"
+        "eff80839.760f28",
+        "81242a80.6995e8",
+        "a9774cfd.8e266",
+        "1742a4f9.42112b",
+        "e032978.6936268",
+        "b04f73ae.32d85",
+        "3f331e86.57efa2",
+        "d4d17449.0a3768",
+        "b369fa7c.e07e38",
+        "642263f7.dd00fc"
       ]
     ]
   },
   {
-    "id": "7c3ef39d.83f20c",
+    "id": "eff80839.760f28",
     "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": 3023.1608505249023,
-    "y": 1083.8029837608337,
-    "z": "4f77841b.f6c90c",
+    "x": 2720.1608505249023,
+    "y": 1155.8031058311462,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "19483932.311cc7"
+        "3c2bf5ae.ea0f1a"
       ]
     ]
   },
   {
-    "id": "19483932.311cc7",
+    "id": "3c2bf5ae.ea0f1a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3212.1604766845703,
-    "y": 1085.8028483390808,
-    "z": "4f77841b.f6c90c",
+    "x": 2909.1604766845703,
+    "y": 1157.8029704093933,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "3b79183c.e90878"
+        "ff19cd9d.b44a2"
       ]
     ]
   },
   {
-    "id": "3b79183c.e90878",
+    "id": "ff19cd9d.b44a2",
     "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": 3465.1606521606445,
-    "y": 1085.4028944969177,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3162.1606521606445,
+    "y": 1157.4030165672302,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "18cbc1f3.8102ae",
+    "id": "81242a80.6995e8",
     "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": 3004.1499557495117,
-    "y": 1540.7923188209534,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2694.150302886963,
+    "y": 1529.7923970222473,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "80cf693a.7220c8",
+    "id": "295602b3.df648e",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 714.3167114257812,
-    "y": 1306.2366948127747,
-    "z": "4f77841b.f6c90c",
+    "x": 686.3167266845703,
+    "y": 1162.236707687378,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "6819776a.dd6ac8",
-        "786155e4.c1358c"
+        "49e6bbf9.737be4",
+        "71f6c993.d973c8"
       ]
     ]
   },
   {
-    "id": "786155e4.c1358c",
+    "id": "71f6c993.d973c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 932.9834308624268,
-    "y": 1355.5700516700745,
-    "z": "4f77841b.f6c90c",
+    "x": 904.9834461212158,
+    "y": 1211.5700645446777,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "86bbb2c8.73a38"
+        "71103f59.0e808"
       ]
     ]
   },
   {
-    "id": "6819776a.dd6ac8",
+    "id": "49e6bbf9.737be4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 937.8722324371338,
-    "y": 1264.5701127052307,
-    "z": "4f77841b.f6c90c",
+    "x": 909.8722476959229,
+    "y": 1120.570125579834,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "766accfd.fad464"
+        "20d8c152.565e0e"
       ]
     ]
   },
   {
-    "id": "766accfd.fad464",
+    "id": "20d8c152.565e0e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1084.8722286224365,
-    "y": 1266.4589257240295,
-    "z": "4f77841b.f6c90c",
+    "x": 1056.8722438812256,
+    "y": 1122.4589385986328,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "86bbb2c8.73a38",
+    "id": "71103f59.0e808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1103.094518661499,
-    "y": 1353.5700097084045,
-    "z": "4f77841b.f6c90c",
+    "x": 1075.094533920288,
+    "y": 1209.5700225830078,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "1a3bb9ea.5fc846",
-        "bafdeb31.9bf788",
-        "8302661e.daec38"
+        "44959453.f2ce1c",
+        "8bc2c84.596c538",
+        "431946d9.2130a8"
       ]
     ]
   },
   {
-    "id": "1a3bb9ea.5fc846",
+    "id": "44959453.f2ce1c",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1333.20556640625,
-    "y": 1288.5700688362122,
-    "z": "4f77841b.f6c90c",
+    "x": 1301.2055473327637,
+    "y": 1176.5700225830078,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "2dbd7031.b0f13",
-        "840dbee8.b38c3"
+        "37b8c945.c963b6",
+        "bce04597.421bd8"
       ]
     ]
   },
   {
-    "id": "2dbd7031.b0f13",
+    "id": "37b8c945.c963b6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1553.649938583374,
-    "y": 1274.5700097084045,
-    "z": "4f77841b.f6c90c",
+    "x": 1496.6499938964844,
+    "y": 1154.570083618164,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "26e907a2.2afef8"
+        "2970ed54.87cac2"
       ]
     ]
   },
   {
-    "id": "840dbee8.b38c3",
+    "id": "bce04597.421bd8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1554.64990234375,
-    "y": 1320.5700688362122,
-    "z": "4f77841b.f6c90c",
+    "x": 1493.64990234375,
+    "y": 1202.570068359375,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "adf3229f.c54ae"
+        "a5084037.7afaf"
       ]
     ]
   },
   {
-    "id": "26e907a2.2afef8",
+    "id": "2970ed54.87cac2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1741.205602645874,
-    "y": 1271.5700097084045,
-    "z": "4f77841b.f6c90c",
+    "x": 1684.2056579589844,
+    "y": 1151.570083618164,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "87392ac2.70f368"
+        "c697bcdd.29bcd"
       ]
     ]
   },
   {
-    "id": "adf3229f.c54ae",
+    "id": "a5084037.7afaf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1742.20556640625,
-    "y": 1319.5700688362122,
-    "z": "4f77841b.f6c90c",
+    "x": 1681.20556640625,
+    "y": 1201.570068359375,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "e8d19413.2d1f98"
+        "10ed7f5b.5c00f1"
       ]
     ]
   },
   {
-    "id": "ea1f1cf0.78972",
+    "id": "3b7ac17e.0f823e",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2273.4766960144043,
-    "y": 430.5078196525574,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2193.4767417907715,
+    "y": 438.50785398483276,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "9aaa3746.59be18",
+    "id": "71841c48.209304",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 678.9765739440918,
-    "y": 576.2578291893005,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 682.9766387939453,
+    "y": 527.2578740119934,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "602ccaa6.5c1754",
+    "id": "d3f500c4.1bfb3",
     "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": 732.97265625,
-    "y": 715.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 733.9727325439453,
+    "y": 736.0039968490601,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "1665d4d8.fb3cab",
+    "id": "7ecc4648.197a88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 968.97265625,
-    "y": 743.0039067268372,
-    "z": "4f77841b.f6c90c",
+    "x": 1093.972885131836,
+    "y": 807.0039834976196,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d2585978.579578"
+        "2393b2c8.86b16e"
       ]
     ]
   },
   {
-    "id": "7f1aaa67.966654",
+    "id": "dfe397a0.b9ba28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 960.8244590759277,
-    "y": 778.0699915885925,
-    "z": "4f77841b.f6c90c",
+    "x": 1085.8246879577637,
+    "y": 842.070068359375,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "417b4b0.5e31db4"
+        "1a3d638c.318b9c"
       ]
     ]
   },
   {
-    "id": "417b4b0.5e31db4",
+    "id": "1a3d638c.318b9c",
     "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",
+    "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": 1135.97314453125,
-    "y": 774.3373417854309,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1231.9734687805176,
+    "y": 841.3374795913696,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d2585978.579578",
+    "id": "2393b2c8.86b16e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1119.97265625,
-    "y": 741.0039067268372,
-    "z": "4f77841b.f6c90c",
+    "x": 1224.9729804992676,
+    "y": 807.0040445327759,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "7d0763b3.444adc",
+    "id": "7b79fb1a.832b54",
     "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": 2740.9725818634033,
-    "y": 1062.0040020942688,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2755.973213195801,
+    "y": 1005.00417137146,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "a8542804.b5e6c8",
+    "id": "2c4d90a6.77e83",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2724.9725818634033,
-    "y": 1023.0040020942688,
-    "z": "4f77841b.f6c90c",
+    "x": 2740.9733352661133,
+    "y": 972.0041561126709,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "85ce847d.6d7528",
+    "id": "aa223239.c5978",
     "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": 824.97265625,
-    "y": 860.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 819.9726715087891,
+    "y": 909.0039710998535,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "3af7f371.2bc2ac",
+    "id": "3eb9877e.29bda8",
     "type": "comment",
     "name": "If other EP exists set destination end point",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 764.97265625,
-    "y": 1231.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 736.9726715087891,
+    "y": 1087.0039196014404,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "5c493845.192678",
+    "id": "6bea5b5c.cc56a4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1531.97265625,
-    "y": 1437.0039067268372,
-    "z": "4f77841b.f6c90c",
+    "x": 1476.9727935791016,
+    "y": 1414.0042009353638,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "3869f025.0085f",
-        "6d83eb1f.c06da4",
-        "4ef9f41a.4cbccc",
-        "6ef50d20.7a2d94",
-        "1ec5a1f5.39482e",
-        "2020b84a.aa3f78",
-        "2fc4c609.3e5f6a",
-        "8d865fcb.ed997"
+        "873a1eb1.c2b41",
+        "ec2f2c59.85a72",
+        "4344ccac.0cc2d4",
+        "3e861847.acb138",
+        "dbce043e.c1b088",
+        "6cf22112.6f2ff",
+        "447be204.cdf4fc",
+        "3722b20a.c8338e"
       ]
     ]
   },
   {
-    "id": "3869f025.0085f",
+    "id": "873a1eb1.c2b41",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1768.48291015625,
-    "y": 1370.0142827033997,
-    "z": "4f77841b.f6c90c",
+    "x": 1719.4830951690674,
+    "y": 1284.014597415924,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "c5fce3c7.fd67c"
+        "e78fa7d0.0dc8a8"
       ]
     ]
   },
   {
-    "id": "6d83eb1f.c06da4",
+    "id": "ec2f2c59.85a72",
     "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": 1741.4728622436523,
-    "y": 1675.0042462348938,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1692.4730472564697,
+    "y": 1589.0045609474182,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4ef9f41a.4cbccc",
+    "id": "4344ccac.0cc2d4",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1759.9727401733398,
-    "y": 1413.7818140983582,
-    "z": "4f77841b.f6c90c",
+    "x": 1710.9729251861572,
+    "y": 1327.7821288108826,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "28368228.3fc38e"
+        "e0447eeb.b4df4"
       ]
     ]
   },
   {
-    "id": "6ef50d20.7a2d94",
+    "id": "3e861847.acb138",
     "type": "switchNode",
     "name": "switch clientSignal",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1753.9727783203125,
-    "y": 1459.7818608283997,
-    "z": "4f77841b.f6c90c",
+    "x": 1704.9729633331299,
+    "y": 1373.782175540924,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "acc31d1c.59732"
+        "851a1f33.b90d6"
       ]
     ]
   },
   {
-    "id": "1ec5a1f5.39482e",
+    "id": "dbce043e.c1b088",
     "type": "switchNode",
     "name": "switch cVLAN",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1737.9622802734375,
-    "y": 1498.7713627815247,
-    "z": "4f77841b.f6c90c",
+    "x": 1688.9624652862549,
+    "y": 1412.771677494049,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d493c625.a30ae8"
+        "cde9b854.f3d7e8"
       ]
     ]
   },
   {
-    "id": "c5fce3c7.fd67c",
+    "id": "e78fa7d0.0dc8a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1946.19482421875,
-    "y": 1370.6706547737122,
-    "z": "4f77841b.f6c90c",
+    "x": 1897.1950092315674,
+    "y": 1284.6709694862366,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "11ae82e.b231c7d"
+        "bfb532e5.03a1a"
       ]
     ]
   },
   {
-    "id": "11ae82e.b231c7d",
+    "id": "bfb532e5.03a1a",
     "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": 2119.19482421875,
-    "y": 1370.2706303596497,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2072.1950092315674,
+    "y": 1284.270944595337,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "28368228.3fc38e",
+    "id": "e0447eeb.b4df4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1941.6846923828125,
-    "y": 1413.4381108283997,
-    "z": "4f77841b.f6c90c",
+    "x": 1892.6848773956299,
+    "y": 1327.438425540924,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "304613c.5ad2cec"
+        "b05efaae.c42928"
       ]
     ]
   },
   {
-    "id": "acc31d1c.59732",
+    "id": "851a1f33.b90d6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1941.6846923828125,
-    "y": 1459.4381108283997,
-    "z": "4f77841b.f6c90c",
+    "x": 1892.6848773956299,
+    "y": 1373.438425540924,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "fab4a63a.f922d8"
+        "24c05af2.8faa76"
       ]
     ]
   },
   {
-    "id": "d493c625.a30ae8",
+    "id": "cde9b854.f3d7e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1941.6741943359375,
-    "y": 1498.4277348518372,
-    "z": "4f77841b.f6c90c",
+    "x": 1892.6743793487549,
+    "y": 1412.4280495643616,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "2e48f16d.306a3e"
+        "27931eaa.157cb2"
       ]
     ]
   },
   {
-    "id": "bafdeb31.9bf788",
+    "id": "8bc2c84.596c538",
     "type": "for",
     "name": "for idx..tmp.ep.parameters[]",
-    "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >",
+    "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1349.97265625,
-    "y": 1370.0039067268372,
-    "z": "4f77841b.f6c90c",
+    "x": 1329.97265625,
+    "y": 1302.00390625,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "5c493845.192678"
+        "6bea5b5c.cc56a4"
       ]
     ]
   },
   {
-    "id": "87392ac2.70f368",
+    "id": "c697bcdd.29bcd",
     "type": "set",
     "name": "set tmp.ep.parameters",
-    "xml": "<set>\n<parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-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": 1952.97265625,
-    "y": 1271.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1895.9727115631104,
+    "y": 1151.0039806365967,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "e8d19413.2d1f98",
+    "id": "10ed7f5b.5c00f1",
     "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",
+    "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n",
     "comments": "",
-    "x": 1953.972620010376,
-    "y": 1315.0039658546448,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1892.972620010376,
+    "y": 1197.0039653778076,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "304613c.5ad2cec",
+    "id": "b05efaae.c42928",
     "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": 2118.97265625,
-    "y": 1413.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2069.9728412628174,
+    "y": 1327.0042214393616,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "fab4a63a.f922d8",
+    "id": "24c05af2.8faa76",
     "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": 2112.97265625,
-    "y": 1457.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2063.9728412628174,
+    "y": 1371.0042214393616,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "2e48f16d.306a3e",
+    "id": "27931eaa.157cb2",
     "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": 2103.97265625,
-    "y": 1496.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "8302661e.daec38",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 743.97265625,
-    "y": 1598.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      [
-        "fe3d007c.a7b3a",
-        "d535134a.50d41"
-      ]
-    ]
+    "x": 2054.9728412628174,
+    "y": 1410.0042214393616,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "bec1e4c7.8b8598",
+    "id": "1eb5604c.140ea",
     "type": "comment",
     "name": "Get controller info and send request",
     "info": "",
     "comments": "",
-    "x": 693.97265625,
-    "y": 1560.0039067268372,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1936.972713470459,
+    "y": 1881.004059791565,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "17954934.ffd177",
+    "id": "4c07dee.6ce442",
     "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.openecomp.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": 1386.9726867675781,
-    "y": 2076.0046677589417,
-    "z": "4f77841b.f6c90c",
+    "x": 1989.97314453125,
+    "y": 2024.0048599243164,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "cabe4ed3.59977",
-        "efc13d2a.c27fa"
+        "ebb13c18.63d5b",
+        "27ef146.5170fec"
       ]
     ]
   },
   {
-    "id": "cabe4ed3.59977",
+    "id": "ebb13c18.63d5b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1673.9726791381836,
-    "y": 2097.004617214203,
-    "z": "4f77841b.f6c90c",
+    "x": 2255.972869873047,
+    "y": 2053.004982948303,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "4d9476e4.ffbd08"
+        "3abdd3d8.70de3c"
       ]
     ]
   },
   {
-    "id": "4d9476e4.ffbd08",
+    "id": "3abdd3d8.70de3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1843.9726181030273,
-    "y": 2100.004617214203,
-    "z": "4f77841b.f6c90c",
+    "x": 2403.972869873047,
+    "y": 2051.0048608779907,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "cb5d2c8f.264c6",
+    "id": "252b7082.c5a2b",
     "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": 1843.9727401733398,
-    "y": 2056.004617214203,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2385.972900390625,
+    "y": 1998.0049209594727,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "efc13d2a.c27fa",
+    "id": "27ef146.5170fec",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1676.9726181030273,
-    "y": 2056.004617214203,
-    "z": "4f77841b.f6c90c",
+    "x": 2246.9728088378906,
+    "y": 1998.0049209594727,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "cb5d2c8f.264c6"
+        "252b7082.c5a2b"
       ]
     ]
   },
   {
-    "id": "e2b1aa80.433d58",
+    "id": "b6a98854.3d7a58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 994.7349166870117,
-    "y": 2668.9571779966354,
-    "z": "4f77841b.f6c90c",
+    "x": 908.7350807189941,
+    "y": 2104.9576148986816,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "49e7952b.6308dc"
+        "35924502.aff77a"
       ]
     ]
   },
   {
-    "id": "49e7952b.6308dc",
+    "id": "35924502.aff77a",
     "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": 1161.2587966918945,
-    "y": 2680.5762490034103,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1075.2589015960693,
+    "y": 2131.5766220092773,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "b0220db9.73208",
+    "id": "89209832.9697d8",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1001.8302040100098,
-    "y": 2701.719145655632,
-    "z": "4f77841b.f6c90c",
+    "x": 910.8303089141846,
+    "y": 2152.719457626343,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "49e7952b.6308dc"
+        "35924502.aff77a"
       ]
     ]
   },
   {
-    "id": "8836c87e.2127d8",
+    "id": "48f4ae61.b756e",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 713.7826309204102,
-    "y": 2651.3065662384033,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "ae69a5b4.bcb4d8",
-    "type": "comment",
-    "name": "TODO: Rework after confirmation from AAI",
-    "info": "",
-    "comments": "",
-    "x": 1014.1415405273438,
-    "y": 2628.8776049613953,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 682.7827243804932,
+    "y": 2093.3067779541016,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "a26aed10.bae5b",
+    "id": "e1d773b9.aec52",
     "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": 728.5503273010254,
-    "y": 2572.8320474624634,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 697.5504207611084,
+    "y": 2014.8322591781616,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4c5d18d9.d86fb8",
+    "id": "5e07c169.5398c",
     "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": 696.9634094238281,
-    "y": 2733.447799682617,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 657.9635925292969,
+    "y": 2200.4480476379395,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "69a30b87.057684",
+    "id": "eba0b0a5.90799",
     "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": 778.2824287414551,
-    "y": 2480.4728212356567,
-    "z": "4f77841b.f6c90c",
+    "x": 750.2825031280518,
+    "y": 1939.4731121063232,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "28d10010.8846d",
-        "a946bcd6.894fb",
-        "dceabbc6.4f8628"
+        "88c5e9d5.563c18",
+        "ade401d9.d9d7d",
+        "c5f54133.a8e19"
       ]
     ]
   },
   {
-    "id": "28d10010.8846d",
+    "id": "88c5e9d5.563c18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1046.9238052368164,
-    "y": 2531.8042329773307,
-    "z": "4f77841b.f6c90c",
+    "x": 1004.9239253997803,
+    "y": 1983.8045063018799,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "8ae56ed5.c0311"
+        "effa0e45.a8e79"
       ]
     ]
   },
   {
-    "id": "a946bcd6.894fb",
+    "id": "ade401d9.d9d7d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1037.9238548278809,
-    "y": 2500.3042587265372,
-    "z": "4f77841b.f6c90c",
+    "x": 1006.9239482879639,
+    "y": 1942.3044704422355,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "8ae56ed5.c0311"
+        "effa0e45.a8e79"
       ]
     ]
   },
   {
-    "id": "dceabbc6.4f8628",
+    "id": "c5f54133.a8e19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.6738929748535,
-    "y": 2470.6613636016846,
-    "z": "4f77841b.f6c90c",
+    "x": 1010.6740322113037,
+    "y": 1893.6616230010986,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "fec8c7a7.259eb8"
+        "f45f0673.a366c8"
       ]
     ]
   },
   {
-    "id": "8ae56ed5.c0311",
+    "id": "effa0e45.a8e79",
     "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": 1207.6738929748535,
-    "y": 2501.054282568395,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1165.67405128479,
+    "y": 1962.054536819458,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "fec8c7a7.259eb8",
+    "id": "f45f0673.a366c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1183.3298606872559,
-    "y": 2466.8535327911377,
-    "z": "4f77841b.f6c90c",
+    "x": 1138.3299770355225,
+    "y": 1895.8537912368774,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "447e9068.877d",
+    "id": "6a3ffb44.1e9004",
     "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": 683.4960250854492,
-    "y": 2331.8538014888763,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 652.4961185455322,
+    "y": 1773.8540132045746,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "195a1754.387c79",
+    "id": "1605273a.149319",
     "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": 700.781867980957,
-    "y": 2404.4733991622925,
-    "z": "4f77841b.f6c90c",
+    "x": 669.78196144104,
+    "y": 1846.4736108779907,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "17bafb78.38c045",
+    "id": "93c61c2f.6bcfd",
     "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": 750.7689476013184,
-    "y": 2441.424479484558,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 719.7690410614014,
+    "y": 1883.4246912002563,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4b7801cc.5bfc5",
+    "id": "6bb92832.c7ba68",
     "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": 697.3375663757324,
-    "y": 2371.0284519195557,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 666.3376598358154,
+    "y": 1813.028663635254,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4bbe982e.918098",
+    "id": "4d71f89f.b7cd18",
     "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": 810.671028137207,
-    "y": 2292.0284039974213,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 779.67112159729,
+    "y": 1734.0286157131195,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "cbc69d8c.531e6",
+    "id": "5c1a3e33.04e12",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 752.2508544921875,
-    "y": 2259.4417057037354,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 721.2509479522705,
+    "y": 1701.4419174194336,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "bc43d14.b5aca3",
+    "id": "8f7266fc.c45038",
     "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.allotted-resource-information.parent-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": 740.2269096374512,
-    "y": 2688.7587089538574,
-    "z": "4f77841b.f6c90c",
+    "x": 709.2270030975342,
+    "y": 2130.7589206695557,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "e2b1aa80.433d58",
-        "b0220db9.73208"
+        "b6a98854.3d7a58",
+        "89209832.9697d8"
       ]
     ]
   },
   {
-    "id": "fe3d007c.a7b3a",
+    "id": "f51b8e7a.4294a",
     "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.openecomp.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`\" />",
+    "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.openecomp.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": 1050.9766693115234,
-    "y": 1586.2583985328674,
-    "z": "4f77841b.f6c90c",
+    "x": 1517.976963043213,
+    "y": 1693.2585725784302,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "4a299f49.a1b2",
-        "c4483a2a.ee5b88"
+        "475ee246.c4d58c",
+        "951a0e07.b45a7"
       ]
     ]
   },
   {
-    "id": "4a299f49.a1b2",
+    "id": "475ee246.c4d58c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1357.9766120910645,
-    "y": 1607.2582454681396,
-    "z": "4f77841b.f6c90c",
+    "x": 1757.9771041870117,
+    "y": 1717.258542060852,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "5d2783a1.6d3b9c"
+        "2cebb233.b139be"
       ]
     ]
   },
   {
-    "id": "5d2783a1.6d3b9c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1527.9765510559082,
-    "y": 1610.2582454681396,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      [
-        
-      ]
-    ]
-  },
-  {
-    "id": "17a7cdf5.434e32",
+    "id": "dfc21d27.a29bd",
     "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",
+    "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": 1527.9766731262207,
-    "y": 1566.2582454681396,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1896.977138519287,
+    "y": 1666.2586336135864,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "c4483a2a.ee5b88",
+    "id": "951a0e07.b45a7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1360.9765510559082,
-    "y": 1566.2582454681396,
-    "z": "4f77841b.f6c90c",
+    "x": 1756.9768905639648,
+    "y": 1666.258632659912,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "17a7cdf5.434e32"
+        "dfc21d27.a29bd"
       ]
     ]
   },
   {
-    "id": "f41dba91.d30b78",
+    "id": "d7025fc8.34b0f",
     "type": "comment",
     "name": "Get VPNs from OOF",
     "info": "",
     "comments": "",
-    "x": 970.9805603027344,
-    "y": 1549.2623658180237,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1503.980884552002,
+    "y": 1660.2625722885132,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d535134a.50d41",
+    "id": "7306bfe1.33065",
     "type": "for",
     "name": "for vidx..oof.vpns_length[]",
     "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 1001.9765586853027,
-    "y": 1670.5079641342163,
-    "z": "4f77841b.f6c90c",
+    "x": 1470.9766845703125,
+    "y": 1798.50830078125,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "1e57fa4c.c37666"
+        "3edaf3bd.0b304c"
       ]
     ]
   },
   {
-    "id": "39fad139.2c54be",
+    "id": "9a8b6203.49db4",
     "type": "comment",
     "name": "Loop through VPN and configure them",
     "info": "",
     "comments": "",
-    "x": 1023.976676940918,
-    "y": 1634.0082244873047,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1500.977138519287,
+    "y": 1761.0086650848389,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d4ff5a6.b2eb6a8",
+    "id": "a9774cfd.8e266",
     "type": "switchNode",
     "name": "switch name",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n                \n",
     "comments": "",
     "outputs": 1,
-    "x": 3002.7609481811523,
-    "y": 1181.1256585121155,
-    "z": "4f77841b.f6c90c",
+    "x": 2697.760986328125,
+    "y": 1247.125732421875,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "3a16beb3.77fd72"
+        "a313d119.ec211"
       ]
     ]
   },
   {
-    "id": "3a16beb3.77fd72",
+    "id": "a313d119.ec211",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3189.760955810547,
-    "y": 1175.1255955696106,
-    "z": "4f77841b.f6c90c",
+    "x": 2886.760955810547,
+    "y": 1247.125717639923,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "16ef01df.25c11e"
+        "3a640881.1aa1d8"
       ]
     ]
   },
   {
-    "id": "16ef01df.25c11e",
+    "id": "3a640881.1aa1d8",
     "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[$idx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "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": 3451.761245727539,
-    "y": 1161.7256226539612,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3127.76127243042,
+    "y": 1246.7257723808289,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "42092cc3.b6ed84",
+    "id": "1742a4f9.42112b",
     "type": "switchNode",
     "name": "switch description",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3013.600616455078,
-    "y": 1219.125593662262,
-    "z": "4f77841b.f6c90c",
+    "x": 2710.6008644104004,
+    "y": 1282.1258273124695,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "23eb9630.e037ca"
+        "26c6398e.ae40a6"
       ]
     ]
   },
   {
-    "id": "23eb9630.e037ca",
+    "id": "26c6398e.ae40a6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3183.600616455078,
-    "y": 1215.125593662262,
-    "z": "4f77841b.f6c90c",
+    "x": 2885.600929260254,
+    "y": 1284.1258130073547,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "eb3f5617.6e6248"
+        "ec7ec9cc.624b18"
       ]
     ]
   },
   {
-    "id": "eb3f5617.6e6248",
+    "id": "ec7ec9cc.624b18",
     "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[$idx].value`' />\n",
+    "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": 3370.934057235718,
-    "y": 1213.5867505073547,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3041.9342460632324,
+    "y": 1281.5868878364563,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "297544d9.6ec98c",
+    "id": "e032978.6936268",
     "type": "switchNode",
     "name": "switch tenantId",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2998.983009338379,
-    "y": 1265.4589972496033,
-    "z": "4f77841b.f6c90c",
+    "x": 2705.983127593994,
+    "y": 1315.4592175483704,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "dbc7c34c.cdaf7"
+        "a0536f01.8cf66"
       ]
     ]
   },
   {
-    "id": "dbc7c34c.cdaf7",
+    "id": "a0536f01.8cf66",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3190.982997894287,
-    "y": 1258.458920955658,
-    "z": "4f77841b.f6c90c",
+    "x": 2883.9831314086914,
+    "y": 1319.4590954780579,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "6550e027.0b278"
+        "a1009c69.a8fed"
       ]
     ]
   },
   {
-    "id": "6550e027.0b278",
+    "id": "a1009c69.a8fed",
     "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[$idx].value`' />\n",
+    "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": 3358.982997894287,
-    "y": 1259.0589270591736,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3021.9833183288574,
+    "y": 1316.0590710639954,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "b4d50d62.6f88a",
+    "id": "3f331e86.57efa2",
     "type": "switchNode",
-    "name": "switch CIR",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
+    "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": 2985.822654724121,
-    "y": 1352.4589791297913,
-    "z": "4f77841b.f6c90c",
+    "x": 2688.822727203369,
+    "y": 1388.4591727256775,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "451e6ff5.dd741"
+        "937bdc12.dc2f3"
       ]
     ]
   },
   {
-    "id": "451e6ff5.dd741",
+    "id": "937bdc12.dc2f3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3193.822723388672,
-    "y": 1348.4589924812317,
-    "z": "4f77841b.f6c90c",
+    "x": 2883.8227920532227,
+    "y": 1389.4591727256775,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "4615d379.ef895c"
+        "5cef9c18.c1e3e4"
       ]
     ]
   },
   {
-    "id": "4615d379.ef895c",
+    "id": "5cef9c18.c1e3e4",
     "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[$idx].value`' />\n",
+    "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": 3343.1560440063477,
-    "y": 1346.9201397895813,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3008.15629196167,
+    "y": 1387.920247554779,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "66d53edd.cdef9",
+    "id": "b04f73ae.32d85",
     "type": "switchNode",
     "name": "switch vpnType",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
+    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3005.1311264038086,
-    "y": 1306.2366981506348,
-    "z": "4f77841b.f6c90c",
+    "x": 2703.131015777588,
+    "y": 1351.236882686615,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "654a7b17.6fec94"
+        "56ebc42c.8ac03c"
       ]
     ]
   },
   {
-    "id": "654a7b17.6fec94",
+    "id": "56ebc42c.8ac03c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3192.1311264038086,
-    "y": 1302.2366981506348,
-    "z": "4f77841b.f6c90c",
+    "x": 2885.131202697754,
+    "y": 1354.236867427826,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "2fb4b95a.7ae496"
+        "74808c5.5744174"
       ]
     ]
   },
   {
-    "id": "2fb4b95a.7ae496",
+    "id": "74808c5.5744174",
     "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[$idx].value`' />\n",
+    "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": 3361.46475982666,
-    "y": 1299.6978631019592,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3021.464946746826,
+    "y": 1350.6981091499329,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "64cab1cd.5d443",
+    "id": "d4d17449.0a3768",
     "type": "switchNode",
-    "name": "switch EIR",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
+    "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": 2987.113105773926,
-    "y": 1395.1568455696106,
-    "z": "4f77841b.f6c90c",
+    "x": 2684.1130714416504,
+    "y": 1422.1570801734924,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "6c9f358b.4ef8ec"
+        "f8a0cc6a.69a85"
       ]
     ]
   },
   {
-    "id": "6c9f358b.4ef8ec",
+    "id": "f8a0cc6a.69a85",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3189.113067626953,
-    "y": 1390.1568655967712,
-    "z": "4f77841b.f6c90c",
+    "x": 2884.1133193969727,
+    "y": 1425.1570191383362,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "e70be1bb.0faca"
+        "f369a42b.d52e88"
       ]
     ]
   },
   {
-    "id": "e70be1bb.0faca",
+    "id": "f369a42b.d52e88",
     "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[$idx].value`' />\n",
+    "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": 3345.4465713500977,
-    "y": 1389.618001461029,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3007.4469413757324,
+    "y": 1424.6180787086487,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "10c9f83a.94e8c8",
+    "id": "b369fa7c.e07e38",
     "type": "switchNode",
-    "name": "switch color-aware",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
+    "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": 3014.1133766174316,
-    "y": 1449.1568112373352,
-    "z": "4f77841b.f6c90c",
+    "x": 2709.113681793213,
+    "y": 1456.1569590568542,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "1f4cc1a3.6b11ee"
+        "6206f9dc.040438"
       ]
     ]
   },
   {
-    "id": "1f4cc1a3.6b11ee",
+    "id": "6206f9dc.040438",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3192.113380432129,
-    "y": 1443.1568036079407,
-    "z": "4f77841b.f6c90c",
+    "x": 2880.1135025024414,
+    "y": 1462.1568975448608,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "9c3700e2.9346b"
+        "be68a268.af6ac"
       ]
     ]
   },
   {
-    "id": "9c3700e2.9346b",
+    "id": "be68a268.af6ac",
     "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[$idx].value`' />\n",
+    "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": 3373.4467582702637,
-    "y": 1442.617962360382,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3028.44681930542,
+    "y": 1462.6181101799011,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "17843ccd.4f45d3",
+    "id": "642263f7.dd00fc",
     "type": "switchNode",
-    "name": "switch coupling-flag",
-    "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
+    "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": 3014.113384246826,
-    "y": 1495.1568360328674,
-    "z": "4f77841b.f6c90c",
+    "x": 2711.1136207580566,
+    "y": 1492.1570210456848,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "1a061794.0a46a8"
+        "fa5db057.82465"
       ]
     ]
   },
   {
-    "id": "1a061794.0a46a8",
+    "id": "fa5db057.82465",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3192.1133766174316,
-    "y": 1487.156804561615,
-    "z": "4f77841b.f6c90c",
+    "x": 2883.1135025024414,
+    "y": 1501.1569905281067,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "17025d4a.2f4a83"
+        "6df9a5ad.64aebc"
       ]
     ]
   },
   {
-    "id": "17025d4a.2f4a83",
+    "id": "6df9a5ad.64aebc",
     "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[$idx].value`' />\n",
+    "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": 3377.4467582702637,
-    "y": 1487.6179871559143,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 3036.44681930542,
+    "y": 1501.6181111335754,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "894df50e.725b18",
+    "id": "dcfbfca6.40021",
     "type": "comment",
     "name": "Check if other EP exists in SOTNConnectionResource",
     "info": "",
     "comments": "",
-    "x": 3117.3167114257812,
-    "y": 1048.7922387123108,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2842.316650390625,
+    "y": 1110.7923583984375,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "cac8b97a.954468",
+    "id": "d09beabc.c794f8",
     "type": "comment",
     "name": "Get other global parameters from network",
     "info": "",
     "comments": "",
-    "x": 3088.3165130615234,
-    "y": 1140.792191028595,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2778.31640625,
+    "y": 1196.7923583984375,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "2020b84a.aa3f78",
+    "id": "6cf22112.6f2ff",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1775.53857421875,
-    "y": 1544.2365727424622,
-    "z": "4f77841b.f6c90c",
+    "x": 1726.5387592315674,
+    "y": 1458.2368874549866,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "b2fc0056.5b557"
+        "c84add66.981c8"
       ]
     ]
   },
   {
-    "id": "b2fc0056.5b557",
+    "id": "c84add66.981c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1962.53857421875,
-    "y": 1540.2365727424622,
-    "z": "4f77841b.f6c90c",
+    "x": 1913.5387592315674,
+    "y": 1454.2368874549866,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d84c0472.872308"
+        "d4a1069.e5c08f8"
       ]
     ]
   },
   {
-    "id": "d84c0472.872308",
+    "id": "d4a1069.e5c08f8",
     "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": 2130.53857421875,
-    "y": 1540.8365788459778,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2081.5387592315674,
+    "y": 1454.8368935585022,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "2fc4c609.3e5f6a",
+    "id": "447be204.cdf4fc",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1766.538589477539,
-    "y": 1587.2470211982727,
-    "z": "4f77841b.f6c90c",
+    "x": 1717.5387744903564,
+    "y": 1501.2473359107971,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d33716c2.7a5c08"
+        "ced037b4.e37178"
       ]
     ]
   },
   {
-    "id": "d33716c2.7a5c08",
+    "id": "ced037b4.e37178",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1953.538589477539,
-    "y": 1583.2470211982727,
-    "z": "4f77841b.f6c90c",
+    "x": 1904.5387744903564,
+    "y": 1497.2473359107971,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "f4503085.70e8"
+        "f03bab32.57be38"
       ]
     ]
   },
   {
-    "id": "f4503085.70e8",
+    "id": "f03bab32.57be38",
     "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": 2121.538589477539,
-    "y": 1583.8470273017883,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2072.5387744903564,
+    "y": 1497.8473420143127,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "8d865fcb.ed997",
+    "id": "3722b20a.c8338e",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1779.5385341644287,
-    "y": 1629.247052192688,
-    "z": "4f77841b.f6c90c",
+    "x": 1730.538719177246,
+    "y": 1543.2473669052124,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "2b04431a.afbcfc"
+        "b6a6f2db.60fe6"
       ]
     ]
   },
   {
-    "id": "2b04431a.afbcfc",
+    "id": "b6a6f2db.60fe6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1966.5385341644287,
-    "y": 1625.247052192688,
-    "z": "4f77841b.f6c90c",
+    "x": 1917.538719177246,
+    "y": 1539.2473669052124,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "28052521.1d41ea"
+        "e9af1870.fc5978"
       ]
     ]
   },
   {
-    "id": "28052521.1d41ea",
+    "id": "e9af1870.fc5978",
     "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": 2134.5385341644287,
-    "y": 1625.8470582962036,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2085.538719177246,
+    "y": 1539.847373008728,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "1e57fa4c.c37666",
+    "id": "3edaf3bd.0b304c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1074.0940399169922,
-    "y": 1756.348135471344,
-    "z": "4f77841b.f6c90c",
+    "x": 1676.0940551757812,
+    "y": 1796.3482403755188,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "17954934.ffd177",
-        "edff10aa.4477f",
-        "4a7a7654.befdb8",
-        "d70e06b2.ae06d8",
-        "fb8e8802.2321a8",
-        "c8bfc2b1.75cdd",
-        "b738f9eb.4faa78",
-        "73934aff.e9fd34",
-        "e16ca07c.f4def",
-        "44ac5fd1.a9ce3"
+        "13419eef.5a7671",
+        "ab382a71.e012a8",
+        "518651aa.2aca3",
+        "24337100.d599a",
+        "12ceff59.6da431",
+        "d86cc1ce.6085e",
+        "30cf4858.64e188",
+        "fa2339a4.1d6f28",
+        "f8b8212e.de624",
+        "4c07dee.6ce442"
       ]
     ]
   },
   {
-    "id": "741fad04.c0bcd4",
+    "id": "9cf5ad87.06886",
     "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": 1772.53857421875,
-    "y": 1910.6810307502747,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2322.538787841797,
+    "y": 1876.6815524101257,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "edff10aa.4477f",
+    "id": "f8b8212e.de624",
     "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": 1336.0385131835938,
-    "y": 1969.6810307502747,
-    "z": "4f77841b.f6c90c",
+    "x": 1939.0386962890625,
+    "y": 1913.6814918518066,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "b6132182.e115",
-        "b6234a23.02b418",
-        "52c7285a.09ea48"
+        "2a73c293.cee82e",
+        "cd5e3cf0.7e544",
+        "e221ac88.e3abb"
       ]
     ]
   },
   {
-    "id": "b6132182.e115",
+    "id": "2a73c293.cee82e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1575.0385131835938,
-    "y": 1922.6810307502747,
-    "z": "4f77841b.f6c90c",
+    "x": 2159.038631439209,
+    "y": 1877.6814608573914,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "741fad04.c0bcd4"
+        "9cf5ad87.06886"
       ]
     ]
   },
   {
-    "id": "b6234a23.02b418",
+    "id": "cd5e3cf0.7e544",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1578.5294799804688,
-    "y": 1970.255066394806,
-    "z": "4f77841b.f6c90c",
+    "x": 2168.529571533203,
+    "y": 1918.2554669380188,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "39fa3945.b568c6"
+        "73ddc8d7.9cef28"
       ]
     ]
   },
   {
-    "id": "52c7285a.09ea48",
+    "id": "e221ac88.e3abb",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1573.8624877929688,
-    "y": 2011.5883793830872,
-    "z": "4f77841b.f6c90c",
+    "x": 2163.862548828125,
+    "y": 1954.5887799263,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "5bc6d6e6.4253f8"
+        "9cd2e5f3.c77dc8"
       ]
     ]
   },
   {
-    "id": "39fa3945.b568c6",
+    "id": "73ddc8d7.9cef28",
     "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": 1755.1008911132812,
-    "y": 1958.5408024787903,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2315.1009216308594,
+    "y": 1914.5412936210632,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "5bc6d6e6.4253f8",
+    "id": "9cd2e5f3.c77dc8",
     "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": 1761.6350440979004,
-    "y": 2007.0275721549988,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2318.6351928710938,
+    "y": 1956.0279278755188,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4a7a7654.befdb8",
+    "id": "fa2339a4.1d6f28",
     "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 AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id \n\t\tAND 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": 1282.53857421875,
-    "y": 1782.6810307502747,
-    "z": "4f77841b.f6c90c",
+    "x": 1884.538589477539,
+    "y": 1822.6811356544495,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "c669a474.548c18",
-        "49f40d92.f6bd74",
-        "a24623ca.7bac3"
+        "346b021b.bac82e",
+        "fe6ca97c.41f258",
+        "fc66139b.853a"
       ]
     ]
   },
   {
-    "id": "c669a474.548c18",
+    "id": "346b021b.bac82e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1629.5385131835938,
-    "y": 1786.6810612678528,
-    "z": "4f77841b.f6c90c",
+    "x": 2066.5386352539062,
+    "y": 1767.681245803833,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "d3849e4d.16c6c"
+        "edadbcd1.1307c"
       ]
     ]
   },
   {
-    "id": "49f40d92.f6bd74",
+    "id": "fe6ca97c.41f258",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1633.0294799804688,
-    "y": 1834.255096912384,
-    "z": "4f77841b.f6c90c",
+    "x": 2067.0295372009277,
+    "y": 1805.2553424835205,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "cbab0518.f00ef8"
+        "df86be3c.187cb"
       ]
     ]
   },
   {
-    "id": "a24623ca.7bac3",
+    "id": "fc66139b.853a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1628.3624877929688,
-    "y": 1875.5884099006653,
-    "z": "4f77841b.f6c90c",
+    "x": 2058.362548828125,
+    "y": 1838.5887174606323,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        "4095ec2a.4a6c64"
+        "589f379c.3c1008"
       ]
     ]
   },
   {
-    "id": "cbab0518.f00ef8",
+    "id": "df86be3c.187cb",
     "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": 1809.6008911132812,
-    "y": 1822.5408329963684,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2214.601161956787,
+    "y": 1804.5412311553955,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "4095ec2a.4a6c64",
+    "id": "589f379c.3c1008",
     "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": 1816.1350440979004,
-    "y": 1871.027602672577,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2212.1351928710938,
+    "y": 1838.027865409851,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d3849e4d.16c6c",
+    "id": "edadbcd1.1307c",
     "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": 1833.5385131835938,
-    "y": 1773.6810612678528,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 2251.5386352539062,
+    "y": 1766.6813678741455,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "b5630d7.89ad9f",
+    "id": "ca8d7a27.974a78",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 1327.0424423217773,
-    "y": 1748.6849284172058,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1935.0425033569336,
+    "y": 1789.6850910186768,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "d70e06b2.ae06d8",
+    "id": "30cf4858.64e188",
     "type": "set",
     "name": "set oof.vpn",
     "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
     "comments": "",
-    "x": 1264.5385437011719,
-    "y": 1709.792055606842,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1896.538589477539,
+    "y": 1743.7922191619873,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "fb8e8802.2321a8",
+    "id": "ab382a71.e012a8",
     "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='cvlan-tag-entry' value='`$prop.connection-attachment.cVLAN`' />\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`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
+    "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": 1313.00390625,
-    "y": 2214.7540521621704,
-    "z": "4f77841b.f6c90c",
+    "x": 1915.004005432129,
+    "y": 2160.7546215057373,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "c8bfc2b1.75cdd",
+    "id": "518651aa.2aca3",
     "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`' />",
+    "xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />",
     "comments": "",
-    "x": 1288.5039520263672,
-    "y": 2176.2539596557617,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1891.504005432129,
+    "y": 2113.2543182373047,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "b738f9eb.4faa78",
+    "id": "24337100.d599a",
     "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.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.networks.network[0].network-id`\" />",
+    "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": 1340.0039367675781,
-    "y": 2252.7539653778076,
-    "z": "4f77841b.f6c90c",
+    "x": 1950.004005432129,
+    "y": 2205.7543773651123,
+    "z": "886e5ee7.da286",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "4b44bb19.a886d4",
+    "id": "abe0f3b4.f562f",
     "type": "comment",
     "name": "save vpn and its relation to AAI",
     "info": "",
     "comments": "",
-    "x": 1325.0039596557617,
-    "y": 2140.7539899349213,
-    "z": "4f77841b.f6c90c",
-    "wires": [
-      
-    ]
+    "x": 1933.0042037963867,
+    "y": 2074.754587173462,
+    "z": "886e5ee7.da286",
+    "wires": []
   },
   {
-    "id": "e16ca07c.f4def",
+    "id": "13419eef.5a7671",
     "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": 1292.0039672851562,
-    "y": 2292.754026412964,
-    "z": "4f77841b.f6c90c",
+    "x": 1902.004035949707,
+    "y": 2245.754497528076,
+    "z": "886e5ee7.da286",
+    "wires": []
+  },
+  {
+    "id": "12ceff59.6da431",
+    "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/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/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": 1936.0039825439453,
+    "y": 2285.5043773651123,
+    "z": "886e5ee7.da286",
     "wires": [
-      
+      []
     ]
   },
   {
-    "id": "73934aff.e9fd34",
+    "id": "d86cc1ce.6085e",
     "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/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`\" />",
+    "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/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/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": 1325.00390625,
-    "y": 2333.50390625,
-    "z": "4f77841b.f6c90c",
+    "x": 1934.0039863586426,
+    "y": 2331.2543773651123,
+    "z": "886e5ee7.da286",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "44848e46.5ebac",
+    "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": 876.0078430175781,
+    "y": 596.0078182220459,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        
+        "5268ad10.1fbc94",
+        "ffb50ed4.11c7e"
       ]
     ]
   },
   {
-    "id": "44ac5fd1.a9ce3",
-    "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/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`\" />",
+    "id": "b29f5799.241a78",
+    "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": 1326.00390625,
-    "y": 2372.25390625,
-    "z": "4f77841b.f6c90c",
+    "x": 803.0079956054688,
+    "y": 823.007981300354,
+    "z": "886e5ee7.da286",
+    "wires": [
+      [
+        "7ecc4648.197a88",
+        "dfe397a0.b9ba28"
+      ]
+    ]
+  },
+  {
+    "id": "3637e175.005c6e",
+    "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": 703.0079040527344,
+    "y": 786.0078144073486,
+    "z": "886e5ee7.da286",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2865c930.441376",
+    "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": 2117.0042572021484,
+    "y": 942.3373756408691,
+    "z": "886e5ee7.da286",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "36209682.cdfdca",
+    "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": 2254.004898071289,
+    "y": 984.8372402191162,
+    "z": "886e5ee7.da286",
+    "wires": [
+      [
+        "2877490b.8d1876",
+        "bf4a739d.0a26c"
+      ]
+    ]
+  },
+  {
+    "id": "2cebb233.b139be",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1879.0041770935059,
+    "y": 1708.0040254592896,
+    "z": "886e5ee7.da286",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "431946d9.2130a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1255.9727897644043,
+    "y": 1733.0042095184326,
+    "z": "886e5ee7.da286",
     "wires": [
       [
-        
+        "7306bfe1.33065",
+        "f51b8e7a.4294a"
       ]
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index 82c27741..441ff93d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "9d8f9fa5.439ad",
+    "id": "e1802764.010338",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 134.00390625,
-    "y": 59.999999046325684,
-    "z": "27f64d8c.2cf692",
+    "x": 75.00390625,
+    "y": 55.999998688697815,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "999b7749.bb2828"
+        "cfe32243.1a54"
       ]
     ]
   },
   {
-    "id": "999b7749.bb2828",
+    "id": "cfe32243.1a54",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1260 +22,1187 @@
     "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": 346.00391006469727,
-    "y": 132.00001621246338,
-    "z": "27f64d8c.2cf692",
+    "x": 287.00391006469727,
+    "y": 128.0000158548355,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "a889b861.30b858"
+        "f32ba3f6.6902c"
       ]
     ]
   },
   {
-    "id": "a889b861.30b858",
+    "id": "f32ba3f6.6902c",
     "type": "method",
     "name": "sotn-attachment-topology-operation-create",
     "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 334.0040283203125,
-    "y": 219.99999904632568,
-    "z": "27f64d8c.2cf692",
+    "x": 275.0040283203125,
+    "y": 215.99999868869781,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "a434e8ee.221048"
+        "7c54b5b2.a3083c"
       ]
     ]
   },
   {
-    "id": "a434e8ee.221048",
+    "id": "7c54b5b2.a3083c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 254.00395965576172,
-    "y": 969.000247001648,
-    "z": "27f64d8c.2cf692",
+    "x": 195.00395965576172,
+    "y": 965.0002466440201,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "c342578d.28b708",
-        "efa6ad20.d82ee",
-        "269c43d6.56387c",
-        "3e97601e.a0c21",
-        "a1d6ff56.9c99d",
-        "1cbd957b.be039b",
-        "52744f96.8455f",
-        "361e33ee.17369c",
-        "8340ac1e.8db72",
-        "d5a721b9.32552",
-        "908d0f20.3dc3f",
-        "e6716760.631bc8",
-        "8217a995.1a4f18",
-        "272d789b.464298",
-        "de9004ee.8e65a8",
-        "61510de6.6b5a64",
-        "a9832c0c.edf5c",
-        "bdd1fffd.ca081",
-        "fc645855.78a1f8",
-        "e28f7f9f.51996",
-        "4298e590.a1603c",
-        "b58ada11.db1438",
-        "d0bb4427.716f08"
+        "3de219b6.a5b006",
+        "2c7c8b4.5796074",
+        "9525b61d.f44608",
+        "45124265.84320c",
+        "3e0bbdc4.8ce3d2",
+        "efb9af7d.38a8c",
+        "67a07981.adb6b8",
+        "238da366.150bec",
+        "482be69b.e1e678",
+        "9c36769e.3b9b78",
+        "1db7126.81503ee",
+        "279f61dd.0cdaee",
+        "b18196af.f3d2c8",
+        "d586facb.6928c8",
+        "83c4b03a.da76",
+        "aeb52a03.a21508",
+        "d0d20150.466f4",
+        "3704681e.a28308",
+        "d25d451e.0f6438",
+        "54b45ac5.3b96f4",
+        "6f9dfa46.6d74e4",
+        "5a5883b8.a68a6c",
+        "d769ff10.bfeae"
       ]
     ]
   },
   {
-    "id": "aad4b525.c81b28",
+    "id": "d194eb73.9913d8",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 725.0805969238281,
-    "y": 144.43391513824463,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 679.0806579589844,
+    "y": 125.43391764163971,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "c342578d.28b708",
+    "id": "3de219b6.a5b006",
     "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": 684.0039367675781,
-    "y": 184.99999141693115,
-    "z": "27f64d8c.2cf692",
+    "x": 625.0039367675781,
+    "y": 180.99999105930328,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "3dca0ad4.c31f16",
-        "5f732a2c.880594"
+        "c41cb638.52f6f8",
+        "e38afa57.231908"
       ]
     ]
   },
   {
-    "id": "3dca0ad4.c31f16",
+    "id": "c41cb638.52f6f8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 935.0039863586426,
-    "y": 146.9999783039093,
-    "z": "27f64d8c.2cf692",
+    "x": 823.0040245056152,
+    "y": 150.9999796152115,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "d23cb383.a5008"
+        "1f1d00d8.31b19f"
       ]
     ]
   },
   {
-    "id": "5f732a2c.880594",
+    "id": "e38afa57.231908",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 936.00390625,
-    "y": 206.99998688697815,
-    "z": "27f64d8c.2cf692",
+    "x": 822.0039329528809,
+    "y": 187.99999010562897,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "e2d02082.677af"
+        "3ee7f443.e400dc"
       ]
     ]
   },
   {
-    "id": "e2d02082.677af",
+    "id": "3ee7f443.e400dc",
     "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": 1168.003890991211,
-    "y": 206.99999165534973,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1020.0039215087891,
+    "y": 185.0000091791153,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "efa6ad20.d82ee",
+    "id": "2c7c8b4.5796074",
     "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": 656.0038299560547,
-    "y": 420.00005626678467,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 593.0038604736328,
+    "y": 402.0000978708267,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "269c43d6.56387c",
+    "id": "9525b61d.f44608",
     "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": 662.2657508850098,
-    "y": 505.66673374176025,
-    "z": "27f64d8c.2cf692",
+    "x": 593.2657775878906,
+    "y": 483.6667791604996,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "3e97601e.a0c21",
+    "id": "45124265.84320c",
     "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": 709.2657318115234,
-    "y": 589.6667013168335,
-    "z": "27f64d8c.2cf692",
+    "x": 646.2658386230469,
+    "y": 570.6666971445084,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "d23cb383.a5008",
+    "id": "1f1d00d8.31b19f",
     "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": 1150.003963470459,
-    "y": 147.9999840259552,
-    "z": "27f64d8c.2cf692",
+    "x": 1038.0040016174316,
+    "y": 151.99998533725739,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "6e27cc35.c13c74"
+        "febe994.1667068"
       ]
     ]
   },
   {
-    "id": "6e27cc35.c13c74",
+    "id": "febe994.1667068",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1368.004005432129,
-    "y": 147.99994778633118,
-    "z": "27f64d8c.2cf692",
+    "x": 1256.0040435791016,
+    "y": 151.99994909763336,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "e6eb33a1.9cd3b"
+        "39c9fb3d.bda924"
       ]
     ]
   },
   {
-    "id": "e6eb33a1.9cd3b",
+    "id": "39c9fb3d.bda924",
     "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": 1534.0039596557617,
-    "y": 147.99996209144592,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1422.0039978027344,
+    "y": 151.9999634027481,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "a1d6ff56.9c99d",
-    "type": "get-resource",
-    "name": "get-resource connection-attachment-allotted-resource",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 757.00390625,
-    "y": 684.7778043746948,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      [
-        "69156564.0efd4c"
-      ]
-    ]
-  },
-  {
-    "id": "69156564.0efd4c",
+    "id": "a969345.5e133c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1077.0039863586426,
-    "y": 686.7777614593506,
-    "z": "27f64d8c.2cf692",
+    "x": 1152.0041370391846,
+    "y": 642.7778698205948,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "852fc020.79a93"
+        "d1ab386a.e79358"
       ]
     ]
   },
   {
-    "id": "8474d88f.5c62c8",
+    "id": "50f962fe.84264c",
     "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": 1810.5223655700684,
-    "y": 687.8438329696655,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1885.5225162506104,
+    "y": 643.8439413309097,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "57300b8d.590704",
+    "id": "a49d5ad5.f5a9d8",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 721.0039443969727,
-    "y": 650.7778549194336,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1008.0040588378906,
+    "y": 576.7779365777969,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "d079c407.4d6f78",
+    "id": "d5f1890a.be37b8",
     "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": 1619.6705627441406,
-    "y": 883.0000419616699,
-    "z": "27f64d8c.2cf692",
+    "x": 1528.6706047058105,
+    "y": 787.000048995018,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "a651bfa.1352c4"
+        "f2c143a3.1f8e7"
       ]
     ]
   },
   {
-    "id": "52744f96.8455f",
+    "id": "efb9af7d.38a8c",
     "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": 772.6699485778809,
-    "y": 843.71404337883,
-    "z": "27f64d8c.2cf692",
+    "x": 710.6699295043945,
+    "y": 763.7140814065933,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "8264b400.beda08",
-        "7056a183.5603b"
+        "82a04eb.e5042b",
+        "c28a32d1.b979"
       ]
     ]
   },
   {
-    "id": "8264b400.beda08",
+    "id": "82a04eb.e5042b",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1094.812831878662,
-    "y": 846.57146525383,
-    "z": "27f64d8c.2cf692",
+    "x": 1014.8128280639648,
+    "y": 732.5715185403824,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "11ae1967.44e4c7"
+        "9ed3f44e.0ef248"
       ]
     ]
   },
   {
-    "id": "7056a183.5603b",
+    "id": "c28a32d1.b979",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1082.8128356933594,
-    "y": 889.5714666843414,
-    "z": "27f64d8c.2cf692",
+    "x": 991.8128776550293,
+    "y": 793.5714737176895,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "138cce38.a61662"
+        "7748cb78.c02984"
       ]
     ]
   },
   {
-    "id": "138cce38.a61662",
+    "id": "7748cb78.c02984",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1242.939926147461,
-    "y": 887.6974432468414,
-    "z": "27f64d8c.2cf692",
+    "x": 1151.9399681091309,
+    "y": 791.6974502801895,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "d079c407.4d6f78",
-        "1d2e79f7.7a22f6",
-        "caba0b91.36a608"
+        "d5f1890a.be37b8",
+        "6c68e940.a09698",
+        "9bbf5449.409148"
       ]
     ]
   },
   {
-    "id": "11ae1967.44e4c7",
+    "id": "9ed3f44e.0ef248",
     "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": 1253.6698036193848,
-    "y": 846.2855279445648,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1164.6698112487793,
+    "y": 730.2855688333511,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "361e33ee.17369c",
+    "id": "67a07981.adb6b8",
     "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": 698.527229309082,
-    "y": 916.2856435775757,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 639.5272216796875,
+    "y": 867.2856460809708,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "1d2e79f7.7a22f6",
+    "id": "6c68e940.a09698",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1432.054973602295,
-    "y": 919.7089660167694,
-    "z": "27f64d8c.2cf692",
+    "x": 1341.0550155639648,
+    "y": 823.7089730501175,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "5635489a.7ffbc8"
+        "e6bed7c6.008fc8"
       ]
     ]
   },
   {
-    "id": "5635489a.7ffbc8",
+    "id": "e6bed7c6.008fc8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1622.0549278259277,
-    "y": 919.7089030742645,
-    "z": "27f64d8c.2cf692",
+    "x": 1531.0549697875977,
+    "y": 823.7089101076126,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "66ad5d1b.da3ab4"
+        "c94cbc62.004a2"
       ]
     ]
   },
   {
-    "id": "66ad5d1b.da3ab4",
+    "id": "c94cbc62.004a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1788.0549278259277,
-    "y": 919.7089030742645,
-    "z": "27f64d8c.2cf692",
+    "x": 1697.0549697875977,
+    "y": 823.7089101076126,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "f92757e1.e50008"
+        "f71f33c4.6780f"
       ]
     ]
   },
   {
-    "id": "a651bfa.1352c4",
+    "id": "f2c143a3.1f8e7",
     "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": 2093.7820434570312,
-    "y": 883.0000257492065,
-    "z": "27f64d8c.2cf692",
+    "x": 1945.7822341918945,
+    "y": 784.0000759363174,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "54bb5ed6.70da5"
+        "22afa8c.31c5058"
       ]
     ]
   },
   {
-    "id": "54bb5ed6.70da5",
+    "id": "22afa8c.31c5058",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2318.591772079468,
-    "y": 885.4644467830658,
-    "z": "27f64d8c.2cf692",
+    "x": 2127.591808319092,
+    "y": 784.4645229578018,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "d7b2b6d3.cadeb8"
+        "349f45ed.6a61aa"
       ]
     ]
   },
   {
-    "id": "f92757e1.e50008",
+    "id": "f71f33c4.6780f",
     "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": 2033.928274154663,
-    "y": 920.2205998897552,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1858.928352355957,
+    "y": 823.2206112146378,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "57bdcf73.d7aa8",
+    "id": "8d32b4a4.1a9fd8",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 791.6711463928223,
-    "y": 772.9999761581421,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 731.671142578125,
+    "y": 694.0000454187393,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "f0cc7d17.67dd7",
+    "id": "fc9006c6.395558",
     "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": 774.0040016174316,
-    "y": 880.7781000137329,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 719.0040588378906,
+    "y": 832.7781378030777,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "b58ada11.db1438",
+    "id": "d769ff10.bfeae",
     "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.allotted-resource-information.parent-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=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan-tag-entry\" value=\"`$prop.connection-attachment.cVLAN`\" />\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",
+    "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.allotted-resource-information.parent-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=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\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": 674.6947441101074,
-    "y": 1909.531907916069,
-    "z": "27f64d8c.2cf692",
+    "x": 629.6947631835938,
+    "y": 1792.5319019556046,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "a1860cc7.e0b1b",
-        "e37a2480.b51108"
+        "e5663fd7.08761",
+        "b7403b0d.cfc148"
       ]
     ]
   },
   {
-    "id": "a1860cc7.e0b1b",
+    "id": "e5663fd7.08761",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 930.4566535949707,
-    "y": 1892.484411597252,
-    "z": "27f64d8c.2cf692",
+    "x": 824.4566993713379,
+    "y": 1783.4845033884048,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "3f25cd5e.443c92"
+        "345b8d51.157ff2"
       ]
     ]
   },
   {
-    "id": "3f25cd5e.443c92",
+    "id": "345b8d51.157ff2",
     "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": 1096.9805335998535,
-    "y": 1904.1034826040268,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 990.9805793762207,
+    "y": 1795.1035743951797,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "e37a2480.b51108",
+    "id": "b7403b0d.cfc148",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 937.5519409179688,
-    "y": 1925.2463792562485,
-    "z": "27f64d8c.2cf692",
+    "x": 831.5519866943359,
+    "y": 1816.2464710474014,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "3f25cd5e.443c92"
+        "345b8d51.157ff2"
       ]
     ]
   },
   {
-    "id": "b9aa3657.c52d58",
+    "id": "ff8e9cff.e34a3",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 649.5043678283691,
-    "y": 1874.8337998390198,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 605.50439453125,
+    "y": 1754.8338733911514,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "af36f779.0f72d8",
+    "id": "5f517bd0.1d2334",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 728.0038757324219,
-    "y": 263.9999933242798,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 665.00390625,
+    "y": 233.99999868869781,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "1cbd957b.be039b",
+    "id": "3e0bbdc4.8ce3d2",
     "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": 688.9271774291992,
-    "y": 297.56605434417725,
-    "z": "27f64d8c.2cf692",
+    "x": 626.9272155761719,
+    "y": 274.5660549402237,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "51e4f8bb.15fd98",
-        "9bc5979.dbcfa68"
+        "ff0b47c3.5cf7f8",
+        "8dd15a77.fb7568"
       ]
     ]
   },
   {
-    "id": "51e4f8bb.15fd98",
+    "id": "ff0b47c3.5cf7f8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 933.9272804260254,
-    "y": 268.56605529785156,
-    "z": "27f64d8c.2cf692",
+    "x": 829.9273681640625,
+    "y": 259.56605780124664,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "8d4b5605.e44fb8"
+        "aae71526.aed0c8"
       ]
     ]
   },
   {
-    "id": "9bc5979.dbcfa68",
+    "id": "8dd15a77.fb7568",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 934.9272003173828,
-    "y": 328.5660638809204,
-    "z": "27f64d8c.2cf692",
+    "x": 822.9271965026855,
+    "y": 299.5660778284073,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "8168f22d.0df79"
+        "c7c46784.6950a8"
       ]
     ]
   },
   {
-    "id": "8168f22d.0df79",
+    "id": "c7c46784.6950a8",
     "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": 1166.9271850585938,
-    "y": 328.566068649292,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1054.9271812438965,
+    "y": 299.56608259677887,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "965843c3.6889f",
+    "id": "e793c2ca.7f688",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 750.0038604736328,
-    "y": 388.00001430511475,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 690.0038681030273,
+    "y": 368.9999986886978,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "eb60ce1a.0aef2",
+    "id": "a57110f9.dcd37",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 728.0038566589355,
-    "y": 470.88889503479004,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 665.0038528442383,
+    "y": 450.8889080286026,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "ef74607d.036b",
+    "id": "9489b4d2.52d1b8",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 692.0038909912109,
-    "y": 554.8888864517212,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 631.0039367675781,
+    "y": 539.8889251947403,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "dddb900f.8862d",
+    "id": "454699aa.1f7a38",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 690.4483680725098,
-    "y": 808.8888585567474,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "65b342f3.64d6cc",
-    "type": "comment",
-    "name": "TODO: Rework after confirmation from AAI",
-    "info": "",
-    "comments": "",
-    "x": 949.8632774353027,
-    "y": 1852.4048385620117,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 632.4483795166016,
+    "y": 725.88886988163,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "4298e590.a1603c",
+    "id": "54b45ac5.3b96f4",
     "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": 663.2720336914062,
-    "y": 1822.3591704368591,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 615.2720489501953,
+    "y": 1699.3592010736465,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "d0bb4427.716f08",
+    "id": "6f9dfa46.6d74e4",
     "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": 632.6851463317871,
-    "y": 1956.9750332832336,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 583.6851272583008,
+    "y": 1840.9749876260757,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "8d4b5605.e44fb8",
+    "id": "aae71526.aed0c8",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1173.0039672851562,
-    "y": 268.999981880188,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1069.0040550231934,
+    "y": 259.99998438358307,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "bdd1fffd.ca081",
+    "id": "d0d20150.466f4",
     "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
+    "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": 787.9980621337891,
-    "y": 1653.4938340187073,
-    "z": "27f64d8c.2cf692",
+    "x": 716.9980697631836,
+    "y": 1559.4938122034073,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "e28f7f9f.51996",
+    "id": "d25d451e.0f6438",
     "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": 723.0041427612305,
-    "y": 1694.0000214576721,
-    "z": "27f64d8c.2cf692",
+    "x": 666.0041809082031,
+    "y": 1633.0001302957535,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "56bb7e95.f927f",
-        "74711000.f0575",
-        "579344a.ffcc7bc"
+        "a217bcb.4b0424",
+        "c7307e94.33922",
+        "88ae5959.9952c8"
       ]
     ]
   },
   {
-    "id": "56bb7e95.f927f",
+    "id": "a217bcb.4b0424",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 991.6455192565918,
-    "y": 1745.331433199346,
-    "z": "27f64d8c.2cf692",
+    "x": 915.6455345153809,
+    "y": 1671.331460595131,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "e2257359.1b116"
+        "45489cfb.5ec6b4"
       ]
     ]
   },
   {
-    "id": "74711000.f0575",
+    "id": "c7307e94.33922",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 982.6455688476562,
-    "y": 1713.8314589485526,
-    "z": "27f64d8c.2cf692",
+    "x": 906.6455841064453,
+    "y": 1639.8314863443375,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "e2257359.1b116"
+        "45489cfb.5ec6b4"
       ]
     ]
   },
   {
-    "id": "579344a.ffcc7bc",
+    "id": "88ae5959.9952c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 986.3956069946289,
-    "y": 1684.1885638237,
-    "z": "27f64d8c.2cf692",
+    "x": 910.395622253418,
+    "y": 1610.1885912194848,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "7d6eb53b.d4c13c"
+        "b883302d.2867d"
       ]
     ]
   },
   {
-    "id": "e2257359.1b116",
+    "id": "45489cfb.5ec6b4",
     "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": 1152.395606994629,
-    "y": 1714.5814827904105,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1076.395622253418,
+    "y": 1640.5815101861954,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "7d6eb53b.d4c13c",
+    "id": "b883302d.2867d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1128.0515747070312,
-    "y": 1680.380733013153,
-    "z": "27f64d8c.2cf692",
+    "x": 1052.0515899658203,
+    "y": 1606.380760408938,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "e6716760.631bc8",
+    "id": "1db7126.81503ee",
     "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": 788.0038719177246,
-    "y": 1214.0001440048218,
-    "z": "27f64d8c.2cf692",
+    "x": 731.0038604736328,
+    "y": 1149.0001636743546,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "f5b61314.7a9ea",
-        "7f95a527.cea04c",
-        "6554700.9ffd59"
+        "8baa1385.678c1",
+        "f79c7ce6.35926",
+        "8ab7afc7.379db"
       ]
     ]
   },
   {
-    "id": "f5b61314.7a9ea",
+    "id": "8baa1385.678c1",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1110.3118896484375,
-    "y": 1258.9983615875244,
-    "z": "27f64d8c.2cf692",
+    "x": 1039.3119201660156,
+    "y": 1180.9984394311905,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "adbe2b8f.bcb438"
+        "1986b301.84772d"
       ]
     ]
   },
   {
-    "id": "7f95a527.cea04c",
+    "id": "f79c7ce6.35926",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1101.311939239502,
-    "y": 1227.498387336731,
-    "z": "27f64d8c.2cf692",
+    "x": 1030.31196975708,
+    "y": 1149.498465180397,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "adbe2b8f.bcb438"
+        "1986b301.84772d"
       ]
     ]
   },
   {
-    "id": "6554700.9ffd59",
+    "id": "8ab7afc7.379db",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1105.0619773864746,
-    "y": 1197.8554922118783,
-    "z": "27f64d8c.2cf692",
+    "x": 1034.0620079040527,
+    "y": 1119.8555700555444,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "f1effaa7.98cb08"
+        "c35b2d72.8a40a"
       ]
     ]
   },
   {
-    "id": "adbe2b8f.bcb438",
+    "id": "1986b301.84772d",
     "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": 1271.0619773864746,
-    "y": 1228.2484111785889,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1200.0620079040527,
+    "y": 1150.248489022255,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "f1effaa7.98cb08",
+    "id": "c35b2d72.8a40a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1246.717945098877,
-    "y": 1194.0476614013314,
-    "z": "27f64d8c.2cf692",
+    "x": 1175.717975616455,
+    "y": 1116.0477392449975,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "8ad1638f.48f57",
+    "id": "373cdeec.8a9792",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 712.0038070678711,
-    "y": 1182.0000429153442,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 660.0038070678711,
+    "y": 1111.0000702142715,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "272d789b.464298",
+    "id": "b18196af.f3d2c8",
     "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": 712.3609619140625,
-    "y": 1416.5716543197632,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 656.3609924316406,
+    "y": 1313.571689248085,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "8217a995.1a4f18",
+    "id": "279f61dd.0cdaee",
     "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": 623.2177734375,
-    "y": 1375.3809804916382,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 570.2177734375,
+    "y": 1281.3810459375381,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "de9004ee.8e65a8",
+    "id": "d586facb.6928c8",
     "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": 689.1707611083984,
-    "y": 1458.6668643951416,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 635.1707916259766,
+    "y": 1347.6668745279312,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "61510de6.6b5a64",
+    "id": "83c4b03a.da76",
     "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": 640.5036277770996,
-    "y": 1541.0004243850708,
-    "z": "27f64d8c.2cf692",
+    "x": 587.5036315917969,
+    "y": 1421.0004020929337,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "a9832c0c.edf5c",
+    "id": "aeb52a03.a21508",
     "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": 691.4906883239746,
-    "y": 1576.9515752792358,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 638.4906692504883,
+    "y": 1476.95163500309,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "fc645855.78a1f8",
+    "id": "3704681e.a28308",
     "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": 633.0592803955078,
-    "y": 1495.5557231903076,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 583.0592880249023,
+    "y": 1382.555760025978,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "e28fb6e1.570bc8",
+    "id": "9f0192ed.a3fed",
     "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": 750.3927764892578,
-    "y": 1335.555583000183,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 700.3927764892578,
+    "y": 1247.5556064844131,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "908d0f20.3dc3f",
+    "id": "9c36769e.3b9b78",
     "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": 753.5039024353027,
-    "y": 1145.0000400543213,
-    "z": "27f64d8c.2cf692",
+    "x": 695.5039215087891,
+    "y": 1075.0000091791153,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "d5a721b9.32552",
+    "id": "482be69b.e1e678",
     "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": 754.5038414001465,
-    "y": 1107.0000896453857,
-    "z": "27f64d8c.2cf692",
+    "x": 691.5038452148438,
+    "y": 1032.0001455545425,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "4df22418.3a53fc",
+    "id": "db2548a3.2d9d88",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 661.5042572021484,
-    "y": 1035.0000867843628,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 609.5043029785156,
+    "y": 961.000098824501,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "8340ac1e.8db72",
+    "id": "238da366.150bec",
     "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": 706.5040893554688,
-    "y": 1071.4999990463257,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 648.5040969848633,
+    "y": 994.500038266182,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "c17a3b14.014a38",
+    "id": "62fbf7be.c1d928",
     "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": 696.0042877197266,
-    "y": 1622.4997611045837,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 643.0042724609375,
+    "y": 1522.4998852014542,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "d7b2b6d3.cadeb8",
+    "id": "349f45ed.6a61aa",
     "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": 2506.7607421875,
-    "y": 883.6458120346069,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 2205.7608795166016,
+    "y": 832.6458278894424,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "caba0b91.36a608",
+    "id": "9bbf5449.409148",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1422.6500091552734,
-    "y": 840.3125638961792,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 1331.6500511169434,
+    "y": 744.3125709295273,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "88129b22.08bd88",
+    "id": "de27f2ed.26659",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 771.2053833007812,
-    "y": 995.9792184829712,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 720.2054138183594,
+    "y": 928.9792553186417,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "209aa5b9.f006fa",
+    "id": "a649f8c3.5ee428",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 691.9726028442383,
-    "y": 1302.9688847064972,
-    "z": "27f64d8c.2cf692",
-    "wires": [
-      
-    ]
+    "x": 640.9726028442383,
+    "y": 1214.9689356088638,
+    "z": "2de7bdd3.0e47b2",
+    "wires": []
   },
   {
-    "id": "852fc020.79a93",
+    "id": "d1ab386a.e79358",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1239.003807067871,
-    "y": 686.2776508331299,
-    "z": "27f64d8c.2cf692",
+    "x": 1314.003957748413,
+    "y": 642.2777591943741,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "f33868e5.1acfb8"
+        "4f0a5d33.427474"
       ]
     ]
   },
   {
-    "id": "f33868e5.1acfb8",
+    "id": "4f0a5d33.427474",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1426.8611869812012,
-    "y": 686.8967862129211,
-    "z": "27f64d8c.2cf692",
+    "x": 1501.8613376617432,
+    "y": 642.8968945741653,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "71e1d814.25e938"
+        "d605048c.9bb9e8"
       ]
     ]
   },
   {
-    "id": "71e1d814.25e938",
+    "id": "d605048c.9bb9e8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1626.1943092346191,
-    "y": 686.8968648910522,
-    "z": "27f64d8c.2cf692",
+    "x": 1701.1944599151611,
+    "y": 642.8969732522964,
+    "z": "2de7bdd3.0e47b2",
+    "wires": [
+      [
+        "50f962fe.84264c"
+      ]
+    ]
+  },
+  {
+    "id": "5a5883b8.a68a6c",
+    "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.0039596557617,
+    "y": 637.0000349283218,
+    "z": "2de7bdd3.0e47b2",
+    "wires": [
+      [
+        "a969345.5e133c8",
+        "ca5d3b75.7711f8"
+      ]
+    ]
+  },
+  {
+    "id": "ca5d3b75.7711f8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1154.0039901733398,
+    "y": 607.0000330209732,
+    "z": "2de7bdd3.0e47b2",
     "wires": [
       [
-        "8474d88f.5c62c8"
+        "9eb0da65.d80ea8"
       ]
     ]
+  },
+  {
+    "id": "9eb0da65.d80ea8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1306.0039901733398,
+    "y": 606.0000330209732,
+    "z": "2de7bdd3.0e47b2",
+    "wires": [
+      []
+    ]
   }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
index 51d135e6..17d40546 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "902cbf05.82ac2",
+    "id": "b54f27ef.5db9a8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109.00390625,
-    "y": 52.999999046325684,
-    "z": "d3dd528c.9edcf",
+    "x": 76.00390625,
+    "y": 37.00390625,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "51c9fb4f.5229b4"
+        "73825793.639008"
       ]
     ]
   },
   {
-    "id": "51c9fb4f.5229b4",
+    "id": "73825793.639008",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1926 +22,1863 @@
     "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": 321.00391006469727,
-    "y": 125.00001621246338,
-    "z": "d3dd528c.9edcf",
+    "x": 288.00391006469727,
+    "y": 109.0039234161377,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "ccbd5d22.8595f"
+        "91a3b40f.a091b8"
       ]
     ]
   },
   {
-    "id": "ccbd5d22.8595f",
+    "id": "91a3b40f.a091b8",
     "type": "method",
     "name": "sotn-attachment-topology-operation-deactivate",
     "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 309.0040283203125,
-    "y": 212.99999904632568,
-    "z": "d3dd528c.9edcf",
+    "x": 276.0040283203125,
+    "y": 197.00390625,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "1f233e48.d0a312"
+        "8b49cdb4.0b003"
       ]
     ]
   },
   {
-    "id": "1f233e48.d0a312",
+    "id": "8b49cdb4.0b003",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 325.0040283203125,
-    "y": 768.0002436637878,
-    "z": "d3dd528c.9edcf",
+    "x": 292.0040283203125,
+    "y": 752.0041508674622,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "c4ceb71c.15c748",
-        "9533eb28.c2dc18",
-        "cf024f6b.1779",
-        "379451f5.6f5f6e",
-        "b6fea8ef.c49268",
-        "509e7b0a.918fb4",
-        "afaa2fc8.ec942",
-        "9831615b.70a3c",
-        "78575bc9.95a094",
-        "6c9c6e62.89b72",
-        "761075c6.da2f4c",
-        "bc240e74.2145b",
-        "ad638e.fad5cc7",
-        "d8c85975.6bf758",
-        "a691ab09.aead58",
-        "72567cb3.f1fbd4",
-        "ce4db8c8.182408",
-        "ea67aab8.ef7588",
-        "53b9be67.07128"
+        "c083b508.69c318",
+        "520006f2.b2e4d8",
+        "70bf29a.577bcd8",
+        "648ef4ed.e1062c",
+        "8e15ef85.af876",
+        "7cd467cc.f359b8",
+        "4ca01b12.aeeae4",
+        "6963b7ed.1ac188",
+        "2a2a1345.d7f2ec",
+        "5c89f183.d2653",
+        "f1e26abf.1dc9f8",
+        "25f9e140.e4210e",
+        "1507ea99.aa8315",
+        "3a95a888.e92908",
+        "dd09565b.b81778",
+        "60ba1f59.42707",
+        "bf1b5f9f.275aa",
+        "ff509458.45f008",
+        "980e2d4b.7e472",
+        "372ff043.61187"
       ]
     ]
   },
   {
-    "id": "c4ceb71c.15c748",
+    "id": "c083b508.69c318",
     "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",
+    "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": 721.9974670410156,
-    "y": 166.9934859275818,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 688.9974670410156,
+    "y": 150.9973931312561,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "2ba99ef0.0a9972",
+    "id": "8cf7665f.0ad548",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 750.9577789306641,
-    "y": 131.02528190612793,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 717.9577789306641,
+    "y": 115.02918910980225,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "9533eb28.c2dc18",
+    "id": "520006f2.b2e4d8",
     "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": 675.9974060058594,
-    "y": 259.9934911727905,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 642.9974060058594,
+    "y": 243.99739837646484,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "9831615b.70a3c",
+    "id": "8e15ef85.af876",
     "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": 682.2592964172363,
-    "y": 347.6602201461792,
-    "z": "d3dd528c.9edcf",
+    "x": 649.2592964172363,
+    "y": 331.6641273498535,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "cf024f6b.1779",
+    "id": "70bf29a.577bcd8",
     "type": "execute",
-    "name": "generate allotted-resource url",
+    "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": 714.2593231201172,
-    "y": 435.66020154953003,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      [
-        
-      ]
-    ]
-  },
-  {
-    "id": "379451f5.6f5f6e",
-    "type": "get-resource",
-    "name": "get-resource connection-attachment-allotted-resource",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 784.9974212646484,
-    "y": 525.7712602615356,
-    "z": "d3dd528c.9edcf",
+    "x": 699.2593994140625,
+    "y": 418.66412830352783,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        "15794b13.fbac75",
-        "e02b6e93.81b44"
-      ]
+      []
     ]
   },
   {
-    "id": "2fa8e20c.3e4dde",
+    "id": "f4f0e304.bbd67",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 791.8122177124023,
-    "y": 497.5385789871216,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 742.8123931884766,
+    "y": 489.54267501831055,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "e89ba5d2.ca7f98",
+    "id": "3183ed7f.7cdf82",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 729.9974365234375,
-    "y": 226.9935007095337,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 696.9974365234375,
+    "y": 210.997407913208,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "f751e97a.0a8c78",
+    "id": "61fa78e8.e88928",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 747.9974021911621,
-    "y": 312.882381439209,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 714.9974021911621,
+    "y": 296.8862886428833,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "48dad372.ba3dcc",
+    "id": "e460b896.d8ce98",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 773.9974212646484,
-    "y": 399.8823404312134,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 740.9974212646484,
+    "y": 383.8862476348877,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "15794b13.fbac75",
+    "id": "f65756e0.dd7818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1084.6706237792969,
-    "y": 510.99999141693115,
-    "z": "d3dd528c.9edcf",
+    "x": 1183.6707344055176,
+    "y": 537.0039348602295,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "952af6d.1617708"
+        "4dc0f774.40c9e8"
       ]
     ]
   },
   {
-    "id": "952af6d.1617708",
+    "id": "4dc0f774.40c9e8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1253.6706275939941,
-    "y": 509.49989223480225,
-    "z": "d3dd528c.9edcf",
+    "x": 1352.6707382202148,
+    "y": 535.5038356781006,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "f480b1f9.28302"
+        "a07cda93.450c08"
       ]
     ]
   },
   {
-    "id": "f480b1f9.28302",
+    "id": "a07cda93.450c08",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1464.5278701782227,
-    "y": 509.11902141571045,
-    "z": "d3dd528c.9edcf",
+    "x": 1525.5280075073242,
+    "y": 473.12299823760986,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "f8514da1.cfdee",
-        "7e23dfd3.3f458"
+        "22ec9ce0.2f5dd4",
+        "f2f6c092.18725"
       ]
     ]
   },
   {
-    "id": "f8514da1.cfdee",
+    "id": "22ec9ce0.2f5dd4",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1653.8611755371094,
-    "y": 509.1189794540405,
-    "z": "d3dd528c.9edcf",
+    "x": 1762.8612518310547,
+    "y": 451.1229486465454,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "738ae2e5.a84e3c"
+        "9d16e841.df5298"
       ]
     ]
   },
   {
-    "id": "738ae2e5.a84e3c",
+    "id": "9d16e841.df5298",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1838.3850650787354,
-    "y": 506.02381324768066,
-    "z": "d3dd528c.9edcf",
+    "x": 1947.3851413726807,
+    "y": 448.02778244018555,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "ee3a63b7.1587f",
-        "30f03cbb.095034",
-        "869cba11.4e5318"
+        "3e7b6049.99c1f",
+        "76484c5f.5d8d34",
+        "659367d9.de17c8"
       ]
     ]
   },
   {
-    "id": "190c7cc8.68d4f3",
+    "id": "15003538.c9037b",
     "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": 1797.5228652954102,
-    "y": 587.0660448074341,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1871.5229835510254,
+    "y": 573.0700235366821,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "e02b6e93.81b44",
+    "id": "1584b53e.263d2b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1076.5224266052246,
-    "y": 546.0660762786865,
-    "z": "d3dd528c.9edcf",
+    "x": 1175.5225372314453,
+    "y": 572.0700197219849,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "be0cca0e.643168"
+        "cfb38062.240c9"
       ]
     ]
   },
   {
-    "id": "be0cca0e.643168",
+    "id": "cfb38062.240c9",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1256.5223770141602,
-    "y": 546.732626914978,
-    "z": "d3dd528c.9edcf",
+    "x": 1355.5224876403809,
+    "y": 572.7365703582764,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "190c7cc8.68d4f3"
+        "15003538.c9037b"
       ]
     ]
   },
   {
-    "id": "7e23dfd3.3f458",
+    "id": "f2f6c092.18725",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1642.1891288757324,
-    "y": 546.3993396759033,
-    "z": "d3dd528c.9edcf",
+    "x": 1751.1892051696777,
+    "y": 488.4033088684082,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "190c7cc8.68d4f3"
+        "15003538.c9037b"
       ]
     ]
   },
   {
-    "id": "ee3a63b7.1587f",
+    "id": "3e7b6049.99c1f",
     "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": 2207.4484100341797,
-    "y": 473.0000296831131,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2193.448699951172,
+    "y": 408.0040121078491,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "869cba11.4e5318",
+    "id": "659367d9.de17c8",
     "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": 2140.4485778808594,
-    "y": 548.4285554885864,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2126.4486961364746,
+    "y": 498.43256664276123,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "30f03cbb.095034",
+    "id": "76484c5f.5d8d34",
     "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": 2150.448356628418,
-    "y": 513.9999895095825,
-    "z": "d3dd528c.9edcf",
+    "x": 2137.448532104492,
+    "y": 452.0040159225464,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "7bf97396.e41b0c",
-        "a79d0f34.3ad1d"
+        "731472d3.90aa5c",
+        "76bb9af5.092564"
       ]
     ]
   },
   {
-    "id": "7bf97396.e41b0c",
+    "id": "731472d3.90aa5c",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2386.048439025879,
-    "y": 508.0000205039978,
-    "z": "d3dd528c.9edcf",
+    "x": 2344.048480987549,
+    "y": 442.0040159225464,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2b17c4af.c9c67c"
+        "e2186fc5.ee965"
       ]
     ]
   },
   {
-    "id": "a79d0f34.3ad1d",
+    "id": "76bb9af5.092564",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2379.7628784179688,
-    "y": 547.4286284446716,
-    "z": "d3dd528c.9edcf",
+    "x": 2343.7630004882812,
+    "y": 484.4326066970825,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2df968ff.a59058"
+        "c14114c.2df93e8"
       ]
     ]
   },
   {
-    "id": "2b17c4af.c9c67c",
+    "id": "e2186fc5.ee965",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2600.518955230713,
-    "y": 509.3756546974182,
-    "z": "d3dd528c.9edcf",
+    "x": 2496.5190353393555,
+    "y": 440.3796663284302,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "2df968ff.a59058",
+    "id": "c14114c.2df93e8",
     "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": 2619.6706581115723,
-    "y": 550.0000185966492,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2516.6708908081055,
+    "y": 481.004017829895,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "4926a336.1549ec",
+    "id": "71b7df96.cf2fe",
     "type": "call",
-    "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
+    "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": 972.3069458007812,
-    "y": 615.4935545921326,
-    "z": "d3dd528c.9edcf",
+    "x": 904.3070220947266,
+    "y": 633.4974970817566,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "78575bc9.95a094",
+    "id": "7cd467cc.f359b8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 654.3130226135254,
-    "y": 615.4998412132263,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      [
-        "4926a336.1549ec"
-      ]
-    ]
-  },
-  {
-    "id": "b6fea8ef.c49268",
-    "type": "get-resource",
-    "name": "get-resource parent-service-data",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 719.0043334960938,
-    "y": 757.5316157341003,
-    "z": "d3dd528c.9edcf",
+    "x": 601.3131866455078,
+    "y": 634.5038452148438,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "7bd13bf5.d657f4",
-        "21599ec.9703d62"
+        "71b7df96.cf2fe"
       ]
     ]
   },
   {
-    "id": "bc002904.292928",
+    "id": "e0dac461.755818",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 839.0042724609375,
-    "y": 686.5315546989441,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 783.0043487548828,
+    "y": 695.5356044769287,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "73d4e1e5.100ea",
+    "id": "6358d403.359d6c",
     "type": "for",
-    "name": "for pidx..mdsal-psd.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1728.1887531280518,
-    "y": 925.0041079521179,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      [
-        "c9283f4f.e54c7"
-      ]
-    ]
-  },
-  {
-    "id": "509e7b0a.918fb4",
-    "type": "switchNode",
-    "name": "switch mdsal-psd.provided-allotted-resources_length",
-    "xml": "<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\n",
+    "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": 785.1881103515625,
-    "y": 901.7180781364441,
-    "z": "d3dd528c.9edcf",
+    "x": 1673.1889038085938,
+    "y": 899.0079889297485,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "b115b5.efc49a48",
-        "77bec0eb.5d668",
-        "722d0ca5.9a3d54"
+        "48ab36b2.10b5c8"
       ]
     ]
   },
   {
-    "id": "b115b5.efc49a48",
+    "id": "e3f9ceb3.fcc12",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1117.3309860229492,
-    "y": 1125.575547479093,
-    "z": "d3dd528c.9edcf",
+    "x": 1079.3308753967285,
+    "y": 1031.5794496536255,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "9692bf9c.5ffa"
+        "6bf2a454.b0478c"
       ]
     ]
   },
   {
-    "id": "94ad2e31.d7a3e",
+    "id": "879c81fc.e34a9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1311.4583415985107,
-    "y": 919.7015204429626,
-    "z": "d3dd528c.9edcf",
+    "x": 1270.4582767486572,
+    "y": 896.7054774537683,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "73d4e1e5.100ea"
+        "6358d403.359d6c"
       ]
     ]
   },
   {
-    "id": "c9283f4f.e54c7",
+    "id": "48ab36b2.10b5c8",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "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": 2163.3001537323,
-    "y": 925.0040049552917,
-    "z": "d3dd528c.9edcf",
+    "x": 2108.300304412842,
+    "y": 899.0078859329224,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "ce361aba.4d4be8",
-        "1207b5bd.65bd4a"
+        "ca0f68e.fe64c98",
+        "9210d9d0.b73bc8"
       ]
     ]
   },
   {
-    "id": "ce361aba.4d4be8",
+    "id": "ca0f68e.fe64c98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2372.1103801727295,
-    "y": 897.4684948921204,
-    "z": "d3dd528c.9edcf",
+    "x": 2317.110652923584,
+    "y": 879.4723424911499,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "9ff06a7f.769658"
+        "bd0a6759.014208"
       ]
     ]
   },
   {
-    "id": "3b258e58.c08552",
+    "id": "5b20e51b.570d9c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2551.8710765838623,
-    "y": 961.3256735801697,
-    "z": "d3dd528c.9edcf",
+    "x": 2465.871406555176,
+    "y": 915.3295240402222,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2345638f.0ed1bc",
-        "fd1f9423.d014e8"
+        "6fdc71ce.76ec1"
       ]
     ]
   },
   {
-    "id": "2345638f.0ed1bc",
+    "id": "6fdc71ce.76ec1",
     "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.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": 2808.728582382202,
-    "y": 935.8971877098083,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "fd1f9423.d014e8",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
+    "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": 2719.5893001556396,
-    "y": 982.6532034873962,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2700.728843688965,
+    "y": 913.9010553359985,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "ededcdc6.ddc17",
+    "id": "645720a8.c9b45",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 774.966552734375,
-    "y": 835.8928828239441,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 706.9667510986328,
+    "y": 865.8968267440796,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "77bec0eb.5d668",
+    "id": "a518915c.e4ec5",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1128.9833793640137,
-    "y": 1049.6772646903992,
-    "z": "d3dd528c.9edcf",
+    "x": 1089.9832229614258,
+    "y": 966.681170463562,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "5c010902.1e64d8"
+        "613ca19d.9a54f"
       ]
     ]
   },
   {
-    "id": "9692bf9c.5ffa",
+    "id": "6bf2a454.b0478c",
     "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": 1289.9833297729492,
-    "y": 1124.6772892698646,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1251.9832191467285,
+    "y": 1030.681191444397,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "722d0ca5.9a3d54",
+    "id": "525b4334.32e11c",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1136.983362197876,
-    "y": 920.6772208213806,
-    "z": "d3dd528c.9edcf",
+    "x": 1095.9832973480225,
+    "y": 897.6811778321862,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "94ad2e31.d7a3e"
+        "879c81fc.e34a9"
       ]
     ]
   },
   {
-    "id": "9ff06a7f.769658",
+    "id": "bd0a6759.014208",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2530.0945949554443,
-    "y": 896.6772379875183,
-    "z": "d3dd528c.9edcf",
+    "x": 2446.094711303711,
+    "y": 874.6810827255249,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "1207b5bd.65bd4a",
+    "id": "9210d9d0.b73bc8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2371.0945949554443,
-    "y": 959.6772379875183,
-    "z": "d3dd528c.9edcf",
+    "x": 2317.0947036743164,
+    "y": 913.6810865402222,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "3b258e58.c08552"
+        "5b20e51b.570d9c"
       ]
     ]
   },
   {
-    "id": "57dd9846.719728",
+    "id": "1306b994.c05466",
     "type": "switchNode",
     "name": "switch mdsal-psd.networks_length",
-    "xml": "<switch test='`$mdsal-psd.networks.network_length`'>\n",
+    "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1565.3168487548828,
-    "y": 1049.8997659683228,
-    "z": "d3dd528c.9edcf",
+    "x": 1502.3169021606445,
+    "y": 969.9036674499512,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "42dfaf86.525d6",
-        "d874512e.3c2f3"
+        "bcbc6710.4989d8",
+        "4a1544ae.b670bc"
       ]
     ]
   },
   {
-    "id": "d874512e.3c2f3",
+    "id": "4a1544ae.b670bc",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1837.3168716430664,
-    "y": 1023.7886009216309,
-    "z": "d3dd528c.9edcf",
+    "x": 1732.3169250488281,
+    "y": 945.7924995422363,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "ccbd0c47.f16a"
+        "dd72a26.9ccfe6"
       ]
     ]
   },
   {
-    "id": "42dfaf86.525d6",
+    "id": "bcbc6710.4989d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1831.316993713379,
-    "y": 1083.7886009216309,
-    "z": "d3dd528c.9edcf",
+    "x": 1726.3170471191406,
+    "y": 1005.7924995422363,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "156eaea.2042551"
+        "a79d34a4.7a5eb8"
       ]
     ]
   },
   {
-    "id": "156eaea.2042551",
+    "id": "a79d34a4.7a5eb8",
     "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": 1987.969337463379,
-    "y": 1084.8904075622559,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1898.9694328308105,
+    "y": 1005.8943061828613,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "e24945d6.e64ac8",
+    "id": "4762bac5.0337d4",
     "type": "set",
     "name": "set tmp.network.",
-    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />\n",
+    "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n",
     "comments": "",
-    "x": 2272.76171875,
-    "y": 1024.7887563705444,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2100.761848449707,
+    "y": 935.7926588058472,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "5c010902.1e64d8",
+    "id": "613ca19d.9a54f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1301.427734375,
-    "y": 1050.7885127067566,
-    "z": "d3dd528c.9edcf",
+    "x": 1262.427577972412,
+    "y": 967.7924184799194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "57dd9846.719728"
+        "1306b994.c05466"
       ]
     ]
   },
   {
-    "id": "ccbd0c47.f16a",
+    "id": "dd72a26.9ccfe6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2029.094581604004,
-    "y": 1026.7884788513184,
-    "z": "d3dd528c.9edcf",
+    "x": 1900.094596862793,
+    "y": 964.7923336029053,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "e24945d6.e64ac8",
-        "36e6716c.6f770e"
+        "4762bac5.0337d4",
+        "da4b8e5c.bc1b9"
       ]
     ]
   },
   {
-    "id": "36e6716c.6f770e",
+    "id": "da4b8e5c.bc1b9",
     "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": 2449.0948486328125,
-    "y": 1086.7884664535522,
-    "z": "d3dd528c.9edcf",
+    "x": 2276.09521484375,
+    "y": 1007.7923412322998,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "e46aaefd.f607b"
+        "ff7a40b2.21a91"
       ]
     ]
   },
   {
-    "id": "e46aaefd.f607b",
+    "id": "ff7a40b2.21a91",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2814.6502323150635,
-    "y": 1086.7885255813599,
-    "z": "d3dd528c.9edcf",
+    "x": 2599.6508750915527,
+    "y": 1008.7924184799194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "4ebafc38.9bc584",
-        "d3b38771.361348"
+        "ffa1f84e.980b68",
+        "b00db02b.eb8b6"
       ]
     ]
   },
   {
-    "id": "4ebafc38.9bc584",
+    "id": "ffa1f84e.980b68",
     "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": 3019.1604862213135,
-    "y": 1089.7989015579224,
-    "z": "d3dd528c.9edcf",
+    "x": 2778.1609802246094,
+    "y": 992.8028364181519,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "3f5b228d.225fde"
+        "3081e79b.edd628"
       ]
     ]
   },
   {
-    "id": "3f5b228d.225fde",
+    "id": "3081e79b.edd628",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3206.1604862213135,
-    "y": 1090.7989015579224,
-    "z": "d3dd528c.9edcf",
+    "x": 2965.1609802246094,
+    "y": 993.8028364181519,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "5885ed34.2fa454"
+        "d1012448.dbd488"
       ]
     ]
   },
   {
-    "id": "5885ed34.2fa454",
+    "id": "d1012448.dbd488",
     "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": 3457.160493850708,
-    "y": 1090.3988437652588,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 3216.160987854004,
+    "y": 993.4027786254883,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "d3b38771.361348",
+    "id": "b00db02b.eb8b6",
     "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": 3002.150384902954,
-    "y": 1134.7885007858276,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2761.15087890625,
+    "y": 1037.7924356460571,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "afaa2fc8.ec942",
+    "id": "648ef4ed.e1062c",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 711.3167114257812,
-    "y": 1313.2327876091003,
-    "z": "d3dd528c.9edcf",
+    "x": 638.3167724609375,
+    "y": 1170.2366914749146,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "465effa9.6427f",
-        "c45531af.37393"
+        "59ee447d.77e34c",
+        "88dd47.020332b8"
       ]
     ]
   },
   {
-    "id": "c45531af.37393",
+    "id": "88dd47.020332b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.9834308624268,
-    "y": 1362.5661444664001,
-    "z": "d3dd528c.9edcf",
+    "x": 820.9836082458496,
+    "y": 1194.5700998306274,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "a447132c.ff129"
+        "f03a557c.a1bc78"
       ]
     ]
   },
   {
-    "id": "465effa9.6427f",
+    "id": "59ee447d.77e34c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 934.8722324371338,
-    "y": 1271.5662055015564,
-    "z": "d3dd528c.9edcf",
+    "x": 823.8723793029785,
+    "y": 1133.570198059082,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "98f645f2.256338"
+        "5a5c3a3.170aec4"
       ]
     ]
   },
   {
-    "id": "98f645f2.256338",
+    "id": "5a5c3a3.170aec4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1081.8722286224365,
-    "y": 1273.4550185203552,
-    "z": "d3dd528c.9edcf",
+    "x": 960.8724555969238,
+    "y": 1132.4590120315552,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "a447132c.ff129",
+    "id": "f03a557c.a1bc78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1100.094518661499,
-    "y": 1360.5661025047302,
-    "z": "d3dd528c.9edcf",
+    "x": 991.0946960449219,
+    "y": 1192.5700578689575,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "b6034c83.e1568"
+        "7df4dec5.12529"
       ]
     ]
   },
   {
-    "id": "5c394256.a4b72c",
+    "id": "530d26e7.1066c8",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2270.4766960144043,
-    "y": 437.50391244888306,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2176.476852416992,
+    "y": 372.5078754425049,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "f3cf0d72.a94cd",
+    "id": "96d6938d.7bded",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 675.9765739440918,
-    "y": 583.2539219856262,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 614.9767456054688,
+    "y": 602.2579708099365,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "6c9c6e62.89b72",
+    "id": "4ca01b12.aeeae4",
     "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": 729.97265625,
-    "y": 721.9999995231628,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 667.9728240966797,
+    "y": 727.0041151046753,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "7bd13bf5.d657f4",
+    "id": "13901d91.bcbec2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 965.97265625,
-    "y": 749.9999995231628,
-    "z": "d3dd528c.9edcf",
+    "x": 1045.9728202819824,
+    "y": 776.004114151001,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "9696eaab.88d618"
+        "1def54f0.081ddb"
       ]
     ]
   },
   {
-    "id": "21599ec.9703d62",
+    "id": "eada0637.1dd9c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 957.8244590759277,
-    "y": 785.0660843849182,
-    "z": "d3dd528c.9edcf",
+    "x": 1037.8246231079102,
+    "y": 811.0701990127563,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "26a3704.033389"
+        "7eae3ac9.be18e4"
       ]
     ]
   },
   {
-    "id": "26a3704.033389",
+    "id": "7eae3ac9.be18e4",
     "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": 1132.97314453125,
-    "y": 781.3334345817566,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1212.9733085632324,
+    "y": 807.3375492095947,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "9696eaab.88d618",
+    "id": "1def54f0.081ddb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1116.97265625,
-    "y": 747.9999995231628,
-    "z": "d3dd528c.9edcf",
+    "x": 1196.9728202819824,
+    "y": 774.004114151001,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "761075c6.da2f4c",
+    "id": "6963b7ed.1ac188",
     "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": 821.97265625,
-    "y": 866.9999995231628,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 754.9728164672852,
+    "y": 901.0040884017944,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "419a1f7.f1beae",
+    "id": "e7dc10be.4a762",
     "type": "comment",
     "name": "If other EP exists delete from domain controller",
     "info": "",
     "comments": "",
-    "x": 761.97265625,
-    "y": 1237.9999995231628,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 688.9727172851562,
+    "y": 1095.003903388977,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "19fee4f1.0172ab",
+    "id": "3c03726e.58d62e",
     "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": 2025.9730224609375,
-    "y": 1735.0002546310425,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2693.97354888916,
+    "y": 1392.0043325424194,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "d425caaa.8a6858",
+    "id": "b649f241.fe659",
     "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": 1589.4729614257812,
-    "y": 1794.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2257.473487854004,
+    "y": 1451.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "4f05b74c.969be8",
-        "c7b3919.c8ebe7",
-        "40abfefc.3d745"
+        "4eb1e7d1.a91458",
+        "8b33a960.d74f98",
+        "58a39417.8a89cc"
       ]
     ]
   },
   {
-    "id": "4f05b74c.969be8",
+    "id": "4eb1e7d1.a91458",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1828.4729614257812,
-    "y": 1747.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2496.473487854004,
+    "y": 1404.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "19fee4f1.0172ab"
+        "3c03726e.58d62e"
       ]
     ]
   },
   {
-    "id": "c7b3919.c8ebe7",
+    "id": "8b33a960.d74f98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1831.9639282226562,
-    "y": 1794.5742902755737,
-    "z": "d3dd528c.9edcf",
+    "x": 2499.964454650879,
+    "y": 1451.5783681869507,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "7e0e9058.e96b3"
+        "d1891615.f0fe68"
       ]
     ]
   },
   {
-    "id": "40abfefc.3d745",
+    "id": "58a39417.8a89cc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1827.2969360351562,
-    "y": 1835.907603263855,
-    "z": "d3dd528c.9edcf",
+    "x": 2495.297462463379,
+    "y": 1492.911681175232,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "6ad29b98.83f084"
+        "9094de14.94959"
       ]
     ]
   },
   {
-    "id": "7e0e9058.e96b3",
+    "id": "d1891615.f0fe68",
     "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": 2008.5353393554688,
-    "y": 1782.860026359558,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2676.5358657836914,
+    "y": 1439.864104270935,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "6ad29b98.83f084",
+    "id": "9094de14.94959",
     "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": 2015.069492340088,
-    "y": 1831.3467960357666,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2683.0700187683105,
+    "y": 1488.3508739471436,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "77debd2c.f40a64",
+    "id": "de59b3c5.550e5",
     "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 AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id \n\t\tAND 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": 1539.9730834960938,
-    "y": 1667.00031375885,
-    "z": "d3dd528c.9edcf",
+    "x": 2199.9736404418945,
+    "y": 1336.004324913025,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "b2f42acb.73d9c8",
-        "659e715a.79934",
-        "79d0fb49.773bc4"
+        "e39bc756.013308",
+        "2a9857ce.2f6878",
+        "1952da4b.fcde26"
       ]
     ]
   },
   {
-    "id": "b2f42acb.73d9c8",
+    "id": "e39bc756.013308",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1822.9729309082031,
-    "y": 1608.0002002716064,
-    "z": "d3dd528c.9edcf",
+    "x": 2387.9736557006836,
+    "y": 1282.0043172836304,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "ac4575c7.b5d618"
+        "21d4c191.6f41ee"
       ]
     ]
   },
   {
-    "id": "659e715a.79934",
+    "id": "2a9857ce.2f6878",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1826.4638977050781,
-    "y": 1655.5742359161377,
-    "z": "d3dd528c.9edcf",
+    "x": 2393.464702606201,
+    "y": 1324.5782136917114,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "4fe04183.c5614"
+        "7c6a4960.24dda8"
       ]
     ]
   },
   {
-    "id": "79d0fb49.773bc4",
+    "id": "1952da4b.fcde26",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1821.7969055175781,
-    "y": 1696.907548904419,
-    "z": "d3dd528c.9edcf",
+    "x": 2379.797710418701,
+    "y": 1362.9115495681763,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "5d2c56ed.47c2c8"
+        "6c19b1e1.1bbdd"
       ]
     ]
   },
   {
-    "id": "4fe04183.c5614",
+    "id": "7c6a4960.24dda8",
     "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": 2003.0353088378906,
-    "y": 1643.859972000122,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2547.036003112793,
+    "y": 1314.8640203475952,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "5d2c56ed.47c2c8",
+    "id": "6c19b1e1.1bbdd",
     "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": 2009.5694618225098,
-    "y": 1692.3467416763306,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2543.570182800293,
+    "y": 1354.3508396148682,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "ac4575c7.b5d618",
+    "id": "21d4c191.6f41ee",
     "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": 2026.9729309082031,
-    "y": 1595.0002002716064,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2587.9736709594727,
+    "y": 1277.0043172836304,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "a421d0fb.ce81c",
+    "id": "4f8efcb5.a9cf14",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 1583.4769897460938,
-    "y": 1636.0042810440063,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2243.4775466918945,
+    "y": 1305.0082921981812,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "f8c8821d.d50c3",
+    "id": "35e0c434.3e437c",
     "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.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.openecomp.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": 1637.9730224609375,
-    "y": 1899.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2305.97354888916,
+    "y": 1556.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "925b677f.9fd908",
-        "cff10bd6.5c54c8"
+        "c3b6b741.e17f38",
+        "dfd52870.a619b8"
       ]
     ]
   },
   {
-    "id": "925b677f.9fd908",
+    "id": "c3b6b741.e17f38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1924.9729614257812,
-    "y": 1922.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2592.973487854004,
+    "y": 1579.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "fe5326f7.64a0a8"
+        "1373f104.3035cf"
       ]
     ]
   },
   {
-    "id": "fe5326f7.64a0a8",
+    "id": "1373f104.3035cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 2094.972900390625,
-    "y": 1925.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2762.9734268188477,
+    "y": 1582.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "3a5a8a5c.8b0aa6",
+    "id": "98709530.f9e578",
     "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": 2094.9730224609375,
-    "y": 1881.0002546310425,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2762.97354888916,
+    "y": 1538.0043325424194,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "cff10bd6.5c54c8",
+    "id": "dfd52870.a619b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1927.972900390625,
-    "y": 1881.0002546310425,
-    "z": "d3dd528c.9edcf",
+    "x": 2595.9734268188477,
+    "y": 1538.0043325424194,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "3a5a8a5c.8b0aa6"
+        "98709530.f9e578"
       ]
     ]
   },
   {
-    "id": "b7b5526f.d9371",
+    "id": "a09d44d6.036498",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 985.734619140625,
-    "y": 1896.9525974988937,
-    "z": "d3dd528c.9edcf",
+    "x": 917.7346534729004,
+    "y": 1694.9566963911057,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2cde2bd.f2613d4"
+        "8338cff1.c1a26"
       ]
     ]
   },
   {
-    "id": "2cde2bd.f2613d4",
+    "id": "8338cff1.c1a26",
     "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": 1152.2584991455078,
-    "y": 1908.5716685056686,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1084.2585334777832,
+    "y": 1706.5757673978806,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "8465056c.00dde8",
+    "id": "9111ff4f.4282f",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 992.829906463623,
-    "y": 1929.7145651578903,
-    "z": "d3dd528c.9edcf",
+    "x": 924.8299407958984,
+    "y": 1727.7186640501022,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2cde2bd.f2613d4"
+        "8338cff1.c1a26"
       ]
     ]
   },
   {
-    "id": "dd28433d.d632",
+    "id": "e911009.f267e",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 704.7823333740234,
-    "y": 1879.3019857406616,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "4d323c0f.df7854",
-    "type": "comment",
-    "name": "TODO: Rework after confirmation from AAI",
-    "info": "",
-    "comments": "",
-    "x": 1005.141242980957,
-    "y": 1856.8730244636536,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 636.7823677062988,
+    "y": 1677.3060846328735,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "ce4db8c8.182408",
+    "id": "3a95a888.e92908",
     "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": 719.5500297546387,
-    "y": 1800.8274669647217,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 651.5500640869141,
+    "y": 1598.8315658569336,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "ea67aab8.ef7588",
+    "id": "dd09565b.b81778",
     "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": 687.9631118774414,
-    "y": 1961.4432191848755,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 619.9631462097168,
+    "y": 1759.4473180770874,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "72567cb3.f1fbd4",
+    "id": "1507ea99.aa8315",
     "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": 769.2821311950684,
-    "y": 1708.468240737915,
-    "z": "d3dd528c.9edcf",
+    "x": 701.2821655273438,
+    "y": 1506.472339630127,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "4724b378.ec2a2c",
-        "4dfcb271.a6386c",
-        "4e56cabb.034884"
+        "36bc9007.e2fa4",
+        "65e8ae51.bc0a7",
+        "822d49a0.d686d8"
       ]
     ]
   },
   {
-    "id": "4724b378.ec2a2c",
+    "id": "36bc9007.e2fa4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1037.9235076904297,
-    "y": 1759.799652479589,
-    "z": "d3dd528c.9edcf",
+    "x": 969.9235420227051,
+    "y": 1557.803751371801,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2831c4f6.7c5dbc"
+        "4b0971a1.d1673"
       ]
     ]
   },
   {
-    "id": "4dfcb271.a6386c",
+    "id": "65e8ae51.bc0a7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1028.9235572814941,
-    "y": 1728.2996782287955,
-    "z": "d3dd528c.9edcf",
+    "x": 960.9235916137695,
+    "y": 1526.3037771210074,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2831c4f6.7c5dbc"
+        "4b0971a1.d1673"
       ]
     ]
   },
   {
-    "id": "4e56cabb.034884",
+    "id": "822d49a0.d686d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032.6735954284668,
-    "y": 1698.6567831039429,
-    "z": "d3dd528c.9edcf",
+    "x": 964.6736297607422,
+    "y": 1496.6608819961548,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "a711cf9d.6d6a"
+        "d0da3bc8.9e8958"
       ]
     ]
   },
   {
-    "id": "2831c4f6.7c5dbc",
+    "id": "4b0971a1.d1673",
     "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": 1198.6735954284668,
-    "y": 1729.0497020706534,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 1130.6736297607422,
+    "y": 1527.0538009628654,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "a711cf9d.6d6a",
+    "id": "d0da3bc8.9e8958",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1174.3295631408691,
-    "y": 1694.848952293396,
-    "z": "d3dd528c.9edcf",
+    "x": 1106.3295974731445,
+    "y": 1492.853051185608,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "bc240e74.2145b",
+    "id": "2a2a1345.d7f2ec",
     "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": 674.4957275390625,
-    "y": 1559.8492209911346,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 601.4957847595215,
+    "y": 1356.8532626628876,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "d8c85975.6bf758",
+    "id": "f1e26abf.1dc9f8",
     "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": 691.7815704345703,
-    "y": 1632.4688186645508,
-    "z": "d3dd528c.9edcf",
+    "x": 618.7816276550293,
+    "y": 1429.4728603363037,
+    "z": "4ec136ff.390af8",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "a691ab09.aead58",
+    "id": "25f9e140.e4210e",
     "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": 741.7686500549316,
-    "y": 1669.4198989868164,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 673.768684387207,
+    "y": 1467.4239978790283,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "ad638e.fad5cc7",
+    "id": "5c89f183.d2653",
     "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": 688.3372688293457,
-    "y": 1599.023871421814,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 615.3373260498047,
+    "y": 1396.027913093567,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "1b962b1.7c9dad5",
+    "id": "b42e02fb.93ce4",
     "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": 801.6707305908203,
-    "y": 1520.0238234996796,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 728.6707878112793,
+    "y": 1317.0278651714325,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "aad41a92.c6b998",
+    "id": "3f84c752.6766f8",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 743.2505569458008,
-    "y": 1487.4371252059937,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 670.2506141662598,
+    "y": 1284.4411668777466,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "53b9be67.07128",
+    "id": "60ba1f59.42707",
     "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.allotted-resource-information.parent-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": 731.2266120910645,
-    "y": 1916.7541284561157,
-    "z": "d3dd528c.9edcf",
+    "x": 663.2266464233398,
+    "y": 1714.7582273483276,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "b7b5526f.d9371",
-        "8465056c.00dde8"
+        "a09d44d6.036498",
+        "9111ff4f.4282f"
       ]
     ]
   },
   {
-    "id": "b6034c83.e1568",
+    "id": "7df4dec5.12529",
     "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.networks.network[0].network-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.connectivity' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1315.0043029785156,
-    "y": 1361.5044565200806,
-    "z": "d3dd528c.9edcf",
+    "x": 1197.0044708251953,
+    "y": 1192.5083332061768,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "e5fcddf9.8d24f"
+        "c873d73.0af9728",
+        "1fd3fb2b.7cf7a5"
       ]
     ]
   },
   {
-    "id": "2227c12c.941eae",
+    "id": "482867b5.2cc388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1316.121467590332,
-    "y": 1539.344430923462,
-    "z": "d3dd528c.9edcf",
+    "x": 1970.1217803955078,
+    "y": 1389.3484659194946,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "77debd2c.f40a64",
-        "d425caaa.8a6858",
-        "f8c8821d.d50c3",
-        "6584aa7e.7c6da4",
-        "1fbc8c35.8ef854"
+        "6613cefb.76171",
+        "6eb3502d.b2e8f",
+        "de59b3c5.550e5",
+        "b649f241.fe659",
+        "35e0c434.3e437c"
       ]
     ]
   },
   {
-    "id": "a7e5f7ca.25d0c8",
+    "id": "a4dcab46.732d98",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.2897968292236,
-    "y": 1367.8257465362549,
-    "z": "d3dd528c.9edcf",
+    "x": 1796.290298461914,
+    "y": 1391.8299894332886,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "2227c12c.941eae"
+        "482867b5.2cc388"
       ]
     ]
   },
   {
-    "id": "e5fcddf9.8d24f",
+    "id": "2e8bc3df.71844c",
     "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": 1537.0041198730469,
-    "y": 1368.0041971206665,
-    "z": "d3dd528c.9edcf",
+    "x": 1418.0042419433594,
+    "y": 1390.0082159042358,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "889a6909.fd0648"
+        "8af67803.bf6a88"
       ]
     ]
   },
   {
-    "id": "889a6909.fd0648",
+    "id": "8af67803.bf6a88",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1744.0041809082031,
-    "y": 1367.004243850708,
-    "z": "d3dd528c.9edcf",
+    "x": 1630.0042533874512,
+    "y": 1391.0082159042358,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "a7e5f7ca.25d0c8"
+        "a4dcab46.732d98"
       ]
     ]
   },
   {
-    "id": "6584aa7e.7c6da4",
+    "id": "6eb3502d.b2e8f",
     "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": 1540.0040893554688,
-    "y": 1419.004427909851,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2203.0044479370117,
+    "y": 1103.008532524109,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "1fbc8c35.8ef854",
+    "id": "6613cefb.76171",
     "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": 1544.00390625,
-    "y": 1524.00390625,
-    "z": "d3dd528c.9edcf",
+    "x": 2239.0044021606445,
+    "y": 1204.0078992843628,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "bd900e2d.e6685",
-        "7097b625.7335c8"
+        "41fe5a08.6540e4",
+        "12fef836.878578"
       ]
     ]
   },
   {
-    "id": "7097b625.7335c8",
+    "id": "12fef836.878578",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1761.00390625,
-    "y": 1450.00390625,
-    "z": "d3dd528c.9edcf",
+    "x": 2440.004592895508,
+    "y": 1181.0078916549683,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "719277cb.1f0738"
+        "c4ef2190.9fbc6"
       ]
     ]
   },
   {
-    "id": "719277cb.1f0738",
+    "id": "c4ef2190.9fbc6",
     "type": "set",
     "name": "set tmp.node-id",
     "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n",
     "comments": "",
-    "x": 1968.00390625,
-    "y": 1444.00390625,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2593.004753112793,
+    "y": 1179.0078926086426,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "188e2bb3.ba9264",
+    "id": "fa885e6a.929bd",
     "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": 1943.00390625,
-    "y": 1514.00390625,
-    "z": "d3dd528c.9edcf",
-    "wires": [
-      
-    ]
+    "x": 2577.004919052124,
+    "y": 1228.0078945159912,
+    "z": "4ec136ff.390af8",
+    "wires": []
   },
   {
-    "id": "bd900e2d.e6685",
+    "id": "41fe5a08.6540e4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1762.00390625,
-    "y": 1516.00390625,
-    "z": "d3dd528c.9edcf",
+    "x": 2437.00457572937,
+    "y": 1229.0078964233398,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "fa885e6a.929bd"
+      ]
+    ]
+  },
+  {
+    "id": "c873d73.0af9728",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1378.0040702819824,
+    "y": 1227.0039777755737,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "72cdc300.185abc"
+      ]
+    ]
+  },
+  {
+    "id": "1fd3fb2b.7cf7a5",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1380.855800628662,
+    "y": 1154.0702228546143,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "132951fb.62166e"
+      ]
+    ]
+  },
+  {
+    "id": "132951fb.62166e",
+    "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": 1523.0045700073242,
+    "y": 1154.3376331329346,
+    "z": "4ec136ff.390af8",
+    "wires": []
+  },
+  {
+    "id": "72cdc300.185abc",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1380.0040817260742,
+    "y": 1305.0041437149048,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "2e8bc3df.71844c"
+      ]
+    ]
+  },
+  {
+    "id": "bf1b5f9f.275aa",
+    "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": 816.3378601074219,
+    "y": 553.5038557052612,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "f65756e0.dd7818",
+        "1584b53e.263d2b"
+      ]
+    ]
+  },
+  {
+    "id": "ff509458.45f008",
+    "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": 670.0041046142578,
+    "y": 762.0041170120239,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "980e2d4b.7e472",
+    "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": 737.0040664672852,
+    "y": 797.0042009353638,
+    "z": "4ec136ff.390af8",
+    "wires": [
+      [
+        "13901d91.bcbec2",
+        "eada0637.1dd9c8"
+      ]
+    ]
+  },
+  {
+    "id": "372ff043.61187",
+    "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": 753.1881866455078,
+    "y": 971.7220287322998,
+    "z": "4ec136ff.390af8",
     "wires": [
       [
-        "188e2bb3.ba9264"
+        "e3f9ceb3.fcc12",
+        "a518915c.e4ec5",
+        "525b4334.32e11c"
       ]
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
index ca5ca898..3204bd86 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "40d74cd7.316a14",
+    "id": "4b30503e.867f2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 101,
-    "y": 40,
-    "z": "344982e2.7dca5e",
+    "x": 116.00390625,
+    "y": 47.999999046325684,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "f8cb9b5e.038868"
+        "37e77520.ee3cba"
       ]
     ]
   },
   {
-    "id": "f8cb9b5e.038868",
+    "id": "37e77520.ee3cba",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,992 +22,917 @@
     "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": 313.00000381469727,
-    "y": 112.0000171661377,
-    "z": "344982e2.7dca5e",
+    "x": 328.00391006469727,
+    "y": 120.00001621246338,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "a82adde1.bdf47"
+        "5677b71b.5fb328"
       ]
     ]
   },
   {
-    "id": "a82adde1.bdf47",
+    "id": "5677b71b.5fb328",
     "type": "method",
     "name": "sotn-attachment-topology-operation-delete",
     "xml": "<method rpc='sotn-attachment-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 301.0001220703125,
-    "y": 200,
-    "z": "344982e2.7dca5e",
+    "x": 316.0040283203125,
+    "y": 207.99999904632568,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "949cc74.207fe38"
+        "9d2f20f7.d7e57"
       ]
     ]
   },
   {
-    "id": "949cc74.207fe38",
+    "id": "9d2f20f7.d7e57",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 317.0001220703125,
-    "y": 755.0002446174622,
-    "z": "344982e2.7dca5e",
+    "x": 332.0040283203125,
+    "y": 763.0002436637878,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "e8c0ed11.a9ee2",
-        "acbb646b.d77cc8",
-        "fd6eb40b.cdb328",
-        "9e6bdd2.2396b2",
-        "b1c2a911.f82f08",
-        "90800e39.89524",
-        "3735d68f.ab66da",
-        "c9fb1b0b.8e8c48",
-        "3438f4ce.6e83dc",
-        "8443751c.74bd98",
-        "4de78821.6f3c58",
-        "bcd52af9.df1738",
-        "9273699a.4d08c8",
-        "85ce8a7e.f20d58"
+        "ed51ef95.ae803",
+        "88df7f3c.6dcf",
+        "3f1b61e1.0ac49e",
+        "e2fe8873.3a2848",
+        "d8fe29bc.d00d68",
+        "4903f6e1.1eeb68",
+        "f2266740.3e9f68",
+        "a2240e65.e6034",
+        "1742ced6.939601",
+        "8b97d92c.0d63e8",
+        "4eb557ec.96c928",
+        "608b88dd.e3a5a8",
+        "12cd17c5.66c948",
+        "9eb3dfae.f51c4",
+        "cf61b833.d96918"
       ]
     ]
   },
   {
-    "id": "e8c0ed11.a9ee2",
+    "id": "ed51ef95.ae803",
     "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",
+    "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": 713.9935607910156,
-    "y": 153.9934868812561,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 728.9974670410156,
+    "y": 161.9934859275818,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "43da58d7.610758",
+    "id": "d21298fe.289dd8",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 742.9538726806641,
-    "y": 118.02528285980225,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 757.9577789306641,
+    "y": 126.02528190612793,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "acbb646b.d77cc8",
+    "id": "88df7f3c.6dcf",
     "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": 667.9934997558594,
-    "y": 246.99349212646484,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 682.9974060058594,
+    "y": 254.99349117279053,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "90800e39.89524",
+    "id": "d8fe29bc.d00d68",
     "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": 674.2553901672363,
-    "y": 334.6602210998535,
-    "z": "344982e2.7dca5e",
+    "x": 689.2592964172363,
+    "y": 342.6602201461792,
+    "z": "5c846185.ea888",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "fd6eb40b.cdb328",
+    "id": "3f1b61e1.0ac49e",
     "type": "execute",
     "name": "generate allotted-resource 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": 706.2554168701172,
-    "y": 422.66020250320435,
-    "z": "344982e2.7dca5e",
+    "x": 721.2593231201172,
+    "y": 430.66020154953003,
+    "z": "5c846185.ea888",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "1905b8ab.ca3847",
+    "id": "c43edf3b.dcbac",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 721.9935302734375,
-    "y": 213.993501663208,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 736.9974365234375,
+    "y": 221.9935007095337,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "472b5b53.359df4",
+    "id": "10733905.283097",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 739.9934959411621,
-    "y": 299.8823823928833,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 754.9974021911621,
+    "y": 307.882381439209,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "e758b3f.c00a45",
+    "id": "62545852.867ec8",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 765.9935150146484,
-    "y": 386.8823413848877,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "9e6bdd2.2396b2",
-    "type": "get-resource",
-    "name": "get-resource parent-service-data",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 713.0003890991211,
-    "y": 912.531683921814,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      [
-        "376a6931.f70fe6",
-        "344c3669.3f542a"
-      ]
-    ]
+    "x": 780.9974212646484,
+    "y": 394.8823404312134,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "7df855f0.47079c",
+    "id": "ed0a2645.640ef8",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 833.0003280639648,
-    "y": 841.5316228866577,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 848.0042343139648,
+    "y": 849.5316219329834,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "3af49e65.969612",
+    "id": "a950273c.9f66a8",
     "type": "for",
-    "name": "for pidx..mdsal-psd.provided-allotted-resources.provided-allotted-resource[]",
-    "xml": "<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\n",
+    "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": 1644.1849060058594,
-    "y": 1017.0042171478271,
-    "z": "344982e2.7dca5e",
+    "x": 1676.1888427734375,
+    "y": 1083.0042576789856,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "c4ca63d9.fd59d"
+        "e88ff344.a2353"
       ]
     ]
   },
   {
-    "id": "b1c2a911.f82f08",
+    "id": "e2fe8873.3a2848",
     "type": "switchNode",
-    "name": "switch mdsal-psd.provided-allotted-resources_length",
-    "xml": "<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\n",
+    "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": 772.1841125488281,
-    "y": 1001.7180595397949,
-    "z": "344982e2.7dca5e",
+    "x": 827.1882019042969,
+    "y": 1089.7180404663086,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "af927d7b.49dce",
-        "fc0125f.d3b43d8"
+        "7dbb67ae.29f3f8",
+        "dea01091.d8b15"
       ]
     ]
   },
   {
-    "id": "97446eab.09441",
+    "id": "2fdb27fa.f6ac38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1258.4543991088867,
-    "y": 1057.7015590667725,
-    "z": "344982e2.7dca5e",
+    "x": 1277.4583644866943,
+    "y": 1129.7015261650085,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "3af49e65.969612",
-        "7aae58e1.7b18c8"
+        "a950273c.9f66a8",
+        "19cf7741.613499"
       ]
     ]
   },
   {
-    "id": "c4ca63d9.fd59d",
+    "id": "e88ff344.a2353",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
-    "xml": "<switch test=\"`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
+    "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": 2063.2962188720703,
-    "y": 1017.0040645599365,
-    "z": "344982e2.7dca5e",
+    "x": 2126.300048828125,
+    "y": 1081.0041155815125,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "637d9cfe.cdf994"
+        "c87ef19e.e93cf"
       ]
     ]
   },
   {
-    "id": "3735d68f.ab66da",
+    "id": "4903f6e1.1eeb68",
     "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.9687118530273,
-    "y": 877.0000677108765,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 738.9726181030273,
+    "y": 885.0000667572021,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "376a6931.f70fe6",
+    "id": "9023749d.2a65a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.9687118530273,
-    "y": 905.0000677108765,
-    "z": "344982e2.7dca5e",
+    "x": 1118.972900390625,
+    "y": 963.0001816749573,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "eee1cf23.532fa"
+        "85ec274.d7380d8"
       ]
     ]
   },
   {
-    "id": "344c3669.3f542a",
+    "id": "13a32c23.faaff4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 951.8205146789551,
-    "y": 940.0661525726318,
-    "z": "344982e2.7dca5e",
+    "x": 1110.8247032165527,
+    "y": 998.0662665367126,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "38d98c77.5a5dc4"
+        "61460fc5.a222"
       ]
     ]
   },
   {
-    "id": "38d98c77.5a5dc4",
+    "id": "61460fc5.a222",
     "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": 1126.9692001342773,
-    "y": 936.3335027694702,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1285.973388671875,
+    "y": 994.333616733551,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "eee1cf23.532fa",
+    "id": "85ec274.d7380d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1110.9687118530273,
-    "y": 903.0000677108765,
-    "z": "344982e2.7dca5e",
+    "x": 1269.972900390625,
+    "y": 961.0001816749573,
+    "z": "5c846185.ea888",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "fd82a90d.c15198",
+    "id": "2a315011.b7952",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 952.7306861877441,
-    "y": 1186.9527963399887,
-    "z": "344982e2.7dca5e",
+    "x": 972.7346687316895,
+    "y": 1278.9528144598007,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "a5f6bd09.ffa1d"
+        "398739b4.01afc6"
       ]
     ]
   },
   {
-    "id": "a5f6bd09.ffa1d",
+    "id": "398739b4.01afc6",
     "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": 1119.254566192627,
-    "y": 1198.5718673467636,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1139.2585487365723,
+    "y": 1290.5718854665756,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "399e5f25.1d673",
+    "id": "2e78e3b1.a4cadc",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.8259735107422,
-    "y": 1219.7147639989853,
-    "z": "344982e2.7dca5e",
+    "x": 979.8299560546875,
+    "y": 1311.7147821187973,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "a5f6bd09.ffa1d"
+        "398739b4.01afc6"
       ]
     ]
   },
   {
-    "id": "c1db391c.684108",
+    "id": "3f6ffe96.e0bda2",
     "type": "comment",
     "name": "TODO: Rework after confirmation from AAI",
     "info": "",
     "comments": "",
-    "x": 1084.137351989746,
-    "y": 1137.8731961250305,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1104.1413345336914,
+    "y": 1229.8732142448425,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "c9fb1b0b.8e8c48",
+    "id": "f2266740.3e9f68",
     "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": 685.5460739135742,
-    "y": 1150.8276634216309,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 705.5500564575195,
+    "y": 1242.8276815414429,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "3438f4ce.6e83dc",
+    "id": "a2240e65.e6034",
     "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": 654.9591789245605,
-    "y": 1251.4434180259705,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 674.9631614685059,
+    "y": 1343.4434361457825,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "8443751c.74bd98",
+    "id": "1742ced6.939601",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT AR by id",
     "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='Delete' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 739.6666641235352,
-    "y": 511.3333625793457,
-    "z": "344982e2.7dca5e",
+    "x": 754.6705703735352,
+    "y": 519.3333616256714,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "800033f.1bbe0d",
-        "b5b39fe4.c4cab",
-        "11a37ef9.11cf81"
+        "597f085a.f89fd8",
+        "c3fb7b14.ff60a8",
+        "e4c15d29.0e847"
       ]
     ]
   },
   {
-    "id": "800033f.1bbe0d",
+    "id": "597f085a.f89fd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1008.3080406188965,
-    "y": 562.6647743210196,
-    "z": "344982e2.7dca5e",
+    "x": 994.3120727539062,
+    "y": 559.6649098396301,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "84c30bf1.79ce98"
+        "67fdc38f.4e65cc"
       ]
     ]
   },
   {
-    "id": "b5b39fe4.c4cab",
+    "id": "c3fb7b14.ff60a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 999.3080902099609,
-    "y": 531.1648000702262,
-    "z": "344982e2.7dca5e",
+    "x": 991.3120727539062,
+    "y": 516.1649074554443,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "84c30bf1.79ce98"
+        "67fdc38f.4e65cc"
       ]
     ]
   },
   {
-    "id": "11a37ef9.11cf81",
+    "id": "e4c15d29.0e847",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1003.0581283569336,
-    "y": 501.52190494537354,
-    "z": "344982e2.7dca5e",
+    "x": 998.0621528625488,
+    "y": 475.52200269699097,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "b7efe17a.65f42"
+        "50ef93e6.56ad3c"
       ]
     ]
   },
   {
-    "id": "84c30bf1.79ce98",
+    "id": "67fdc38f.4e65cc",
     "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": 1169.0581283569336,
-    "y": 531.9148239120841,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1150.062240600586,
+    "y": 537.9149079322815,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "b7efe17a.65f42",
+    "id": "50ef93e6.56ad3c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1144.714096069336,
-    "y": 497.71407413482666,
-    "z": "344982e2.7dca5e",
+    "x": 1135.7180843353271,
+    "y": 475.7141823768616,
+    "z": "5c846185.ea888",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "67cf0e71.e946f",
+    "id": "c4e5f3c2.475ed",
     "type": "comment",
     "name": "Delete Allotted Resource",
     "info": "",
     "comments": "",
-    "x": 687.0000457763672,
-    "y": 480.0000286102295,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 702.0039520263672,
+    "y": 488.0000276565552,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "c1be7c26.8538e",
+    "id": "de43dad6.d53448",
     "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": 1637.00390625,
-    "y": 717.00390625,
-    "z": "344982e2.7dca5e",
+    "x": 1652.0078125,
+    "y": 725.0039052963257,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "b702145d.d12dd8"
+        "584a4c5d.3639a4"
       ]
     ]
   },
   {
-    "id": "4de78821.6f3c58",
+    "id": "8b97d92c.0d63e8",
     "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": 790.0032920837402,
-    "y": 677.71790766716,
-    "z": "344982e2.7dca5e",
+    "x": 805.0071983337402,
+    "y": 685.7179067134857,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "9fcadeb2.7ddd3",
-        "f277a541.5d4da8"
+        "3433f8dc.aa0358",
+        "d35e52b4.a3e33"
       ]
     ]
   },
   {
-    "id": "9fcadeb2.7ddd3",
+    "id": "3433f8dc.aa0358",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1114.1461563110352,
-    "y": 660.5753421783447,
-    "z": "344982e2.7dca5e",
+    "x": 1129.1500625610352,
+    "y": 668.5753412246704,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "6ed5686.b9f1498"
+        "e9cfa004.3e1db"
       ]
     ]
   },
   {
-    "id": "f277a541.5d4da8",
+    "id": "d35e52b4.a3e33",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1100.1461791992188,
-    "y": 723.5753309726715,
-    "z": "344982e2.7dca5e",
+    "x": 1115.1500854492188,
+    "y": 731.5753300189972,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "a167b159.d1f0a"
+        "27f778ec.7e6108"
       ]
     ]
   },
   {
-    "id": "a167b159.d1f0a",
+    "id": "27f778ec.7e6108",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1260.2732696533203,
-    "y": 721.7013075351715,
-    "z": "344982e2.7dca5e",
+    "x": 1275.2771759033203,
+    "y": 729.7013065814972,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "c1be7c26.8538e",
-        "a14b9903.574488"
+        "de43dad6.d53448",
+        "c89d5c3.bdcfea"
       ]
     ]
   },
   {
-    "id": "bcd52af9.df1738",
+    "id": "4eb557ec.96c928",
     "type": "set",
     "name": "set consumed allotted resources for deletion",
     "xml": "<set>\n<parameter name=\"service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].\" value=\"\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n",
     "comments": "",
-    "x": 746.8606262207031,
-    "y": 748.28955078125,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 761.8645324707031,
+    "y": 756.2895498275757,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "b702145d.d12dd8",
+    "id": "584a4c5d.3639a4",
     "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": 2075.1155166625977,
-    "y": 713.0040283203125,
-    "z": "344982e2.7dca5e",
+    "x": 2090.1194229125977,
+    "y": 721.0040273666382,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "5f8fbf17.00afa"
+        "c6c0a37e.c2dab"
       ]
     ]
   },
   {
-    "id": "5f8fbf17.00afa",
+    "id": "c6c0a37e.c2dab",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2270.925338745117,
-    "y": 712.4683527946472,
-    "z": "344982e2.7dca5e",
+    "x": 2285.929244995117,
+    "y": 720.4683518409729,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "c51401e.55444"
+        "980eb324.1f10c"
       ]
     ]
   },
   {
-    "id": "43e9034f.c4ea2c",
+    "id": "b3956a96.0877a8",
     "type": "set",
     "name": "set tmp.cidx",
     "xml": "<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n",
     "comments": "",
-    "x": 2582.26171875,
-    "y": 672.2246131896973,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 2601.2657775878906,
+    "y": 721.2246098518372,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "cdccd47e.bede38",
+    "id": "f7015fdd.73e0f",
     "type": "comment",
     "name": "Delete consumed service consumed-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 801.0045623779297,
-    "y": 610.0038724095793,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 816.0084686279297,
+    "y": 618.003871455905,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "d296b738.04dcc8",
+    "id": "1b9b1c3c.959814",
     "type": "comment",
     "name": "This set resource will be deleted in MDSAL by provider code",
     "info": "",
     "comments": "",
-    "x": 791.337345123291,
-    "y": 714.781964302063,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 806.341251373291,
+    "y": 722.7819633483887,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "8922e52b.01caf8",
+    "id": "4ceb1c8.5e02ee4",
     "type": "comment",
     "name": "Obtain the index of conusumed AR",
     "info": "",
     "comments": "",
-    "x": 713.7817535400391,
-    "y": 641.8927326202393,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 728.7856597900391,
+    "y": 649.8927316665649,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "6ed5686.b9f1498",
+    "id": "e9cfa004.3e1db",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1276.00390625,
-    "y": 661.00390625,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "e0029499.0fe808",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2574.003875732422,
-    "y": 732.2540216445923,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1291.0078125,
+    "y": 669.0039052963257,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "c51401e.55444",
+    "id": "980eb324.1f10c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2420.003936767578,
-    "y": 713.2539558410645,
-    "z": "344982e2.7dca5e",
+    "x": 2435.007843017578,
+    "y": 721.2539548873901,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "43e9034f.c4ea2c",
-        "e0029499.0fe808"
+        "b3956a96.0877a8"
       ]
     ]
   },
   {
-    "id": "f81fb204.590a8",
+    "id": "157c6d55.8b7213",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1730.25390625,
-    "y": 770.25390625,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1745.2578125,
+    "y": 778.2539052963257,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "1a2d8fc2.146df",
+    "id": "2c9e34da.91de0c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1592.75390625,
-    "y": 770.25390625,
-    "z": "344982e2.7dca5e",
+    "x": 1607.7578125,
+    "y": 778.2539052963257,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "f81fb204.590a8"
+        "157c6d55.8b7213"
       ]
     ]
   },
   {
-    "id": "a14b9903.574488",
+    "id": "c89d5c3.bdcfea",
     "type": "switchNode",
     "name": "switch tmp.cidx ",
     "xml": "<switch test=\"`$tmp.cidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1438.75390625,
-    "y": 770.25390625,
-    "z": "344982e2.7dca5e",
+    "x": 1453.7578125,
+    "y": 778.2539052963257,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "1a2d8fc2.146df"
+        "2c9e34da.91de0c"
       ]
     ]
   },
   {
-    "id": "a2784c5c.f26de",
+    "id": "c4252e31.dbb43",
     "type": "comment",
     "name": "Delete provided service provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 787.5039215087891,
-    "y": 806.00390625,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 802.5078277587891,
+    "y": 814.0039052963257,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "fc0125f.d3b43d8",
+    "id": "dea01091.d8b15",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1081.5039596557617,
-    "y": 1054.7539730072021,
-    "z": "344982e2.7dca5e",
+    "x": 1130.5080833435059,
+    "y": 1128.7540974617004,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "97446eab.09441"
+        "2fdb27fa.f6ac38"
       ]
     ]
   },
   {
-    "id": "af927d7b.49dce",
+    "id": "7dbb67ae.29f3f8",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1093.5038833618164,
-    "y": 991.7539174556732,
-    "z": "344982e2.7dca5e",
+    "x": 1147.5080032348633,
+    "y": 1040.7539315223694,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "29d2e8ba.860218"
+        "f54472a.345109"
       ]
     ]
   },
   {
-    "id": "29d2e8ba.860218",
+    "id": "f54472a.345109",
     "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=\"Resource to be deleted doesn't exist in MDSAL.\" />\n",
     "comments": "",
-    "x": 1255.3616333007812,
-    "y": 992.1824815273285,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1311.3656005859375,
+    "y": 1041.1824765205383,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "8fbe7fb5.2044c",
+    "id": "e1824da6.1f214",
     "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=\"resource to be deleted is not available in mdsal\" />\n",
     "comments": "",
-    "x": 1752.75390625,
-    "y": 1088.75390625,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 1742.7578563690186,
+    "y": 1158.7539353370667,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "99d40761.083518",
+    "id": "8205df8d.8ddee",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1615.25390625,
-    "y": 1088.75390625,
-    "z": "344982e2.7dca5e",
+    "x": 1605.2578563690186,
+    "y": 1158.7539353370667,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "8fbe7fb5.2044c"
+        "e1824da6.1f214"
       ]
     ]
   },
   {
-    "id": "7aae58e1.7b18c8",
+    "id": "19cf7741.613499",
     "type": "switchNode",
     "name": "switch tmp.pidx ",
     "xml": "<switch test=\"`$tmp.pidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1461.25390625,
-    "y": 1088.75390625,
-    "z": "344982e2.7dca5e",
+    "x": 1451.2578563690186,
+    "y": 1158.7539353370667,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "99d40761.083518"
+        "8205df8d.8ddee"
       ]
     ]
   },
   {
-    "id": "637d9cfe.cdf994",
+    "id": "c87ef19e.e93cf",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2262.503963470459,
-    "y": 1014.7539739608765,
-    "z": "344982e2.7dca5e",
+    "x": 2315.508274078369,
+    "y": 1078.7540936470032,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "240168eb.ef4528"
+        "27e8796d.045376"
       ]
     ]
   },
   {
-    "id": "fb4a1e64.0992d",
+    "id": "33e9010b.6c835e",
     "type": "set",
     "name": "set tmp.pidx",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n",
     "comments": "",
-    "x": 2580.8404235839844,
-    "y": 973.5101690292358,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "a63547e2.d5edc8",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2572.5825805664062,
-    "y": 1033.5395774841309,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 2383.8443908691406,
+    "y": 1213.510190486908,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "240168eb.ef4528",
+    "id": "27e8796d.045376",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2418.5826416015625,
-    "y": 1014.539511680603,
-    "z": "344982e2.7dca5e",
+    "x": 2375.586727142334,
+    "y": 1149.5395798683167,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "fb4a1e64.0992d",
-        "a63547e2.d5edc8"
+        "33e9010b.6c835e"
       ]
     ]
   },
   {
-    "id": "9273699a.4d08c8",
+    "id": "608b88dd.e3a5a8",
     "type": "set",
     "name": "set provided allotted resources for deletion",
-    "xml": "<set>\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource[$pidx].\" value=\"\" />\n<parameter name='service-data.provided-allotted-resources.consumed-allotted-resource_length' value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n",
+    "xml": "<set>\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource[$pidx].\" value=\"\" />\n<parameter name=\"service-data.provided-allotted-resources.consumed-allotted-resource_length\" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />\n\n",
     "comments": "",
-    "x": 741.0039215087891,
-    "y": 1052.003957748413,
-    "z": "344982e2.7dca5e",
-    "wires": [
-      
-    ]
+    "x": 761.0079040527344,
+    "y": 1144.003975868225,
+    "z": "5c846185.ea888",
+    "wires": []
   },
   {
-    "id": "85ce8a7e.f20d58",
+    "id": "12cd17c5.66c948",
     "type": "update",
     "name": "update AAI allotted-resource",
     "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='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.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 698.2226791381836,
-    "y": 1206.7543272972107,
-    "z": "344982e2.7dca5e",
+    "x": 718.2266616821289,
+    "y": 1298.7543454170227,
+    "z": "5c846185.ea888",
+    "wires": [
+      [
+        "2a315011.b7952",
+        "2e78e3b1.a4cadc"
+      ]
+    ]
+  },
+  {
+    "id": "cf61b833.d96918",
+    "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": 808.3373260498047,
+    "y": 984.3333654403687,
+    "z": "5c846185.ea888",
     "wires": [
       [
-        "fd82a90d.c15198",
-        "399e5f25.1d673"
+        "9023749d.2a65a8",
+        "13a32c23.faaff4"
       ]
     ]
+  },
+  {
+    "id": "9eb3dfae.f51c4",
+    "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`\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 742.3372650146484,
+    "y": 942.3332047462463,
+    "z": "5c846185.ea888",
+    "wires": [
+      []
+    ]
   }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
index fa77c6f0..4f6b2fd5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "193b8ebe.168931",
+    "id": "d55e5da1.6e0d9",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 133.03125,
-    "y": 58.03125,
-    "z": "548da231.570f2c",
+    "x": 120.00390625,
+    "y": 81.00390625,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "516b96b5.f39508"
+        "30ea7403.a4dabc"
       ]
     ]
   },
   {
-    "id": "516b96b5.f39508",
+    "id": "30ea7403.a4dabc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,972 +22,942 @@
     "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": 262.3169708251953,
-    "y": 153.26932334899902,
-    "z": "548da231.570f2c",
+    "x": 249.2896270751953,
+    "y": 176.24197959899902,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "d1fe8042.cc5a4"
+        "8e089853.9ab118"
       ]
     ]
   },
   {
-    "id": "d1fe8042.cc5a4",
+    "id": "8e089853.9ab118",
     "type": "method",
     "name": "method validate-connection-attachment-input",
     "xml": "<method rpc='validate-connection-attachment-input' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 258.94793701171875,
-    "y": 249.28427839279175,
-    "z": "548da231.570f2c",
+    "x": 245.92059326171875,
+    "y": 272.25693464279175,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b05ac558.fc0298"
+        "592d05ce.3188dc"
       ]
     ]
   },
   {
-    "id": "b05ac558.fc0298",
+    "id": "592d05ce.3188dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 265.94799041748047,
-    "y": 367.28428649902344,
-    "z": "548da231.570f2c",
+    "x": 252.92064666748047,
+    "y": 390.25694274902344,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "11b2d666.19a8fa",
-        "a0f1dfee.c1db9",
-        "57efdb7e.7de474",
-        "e66639cf.56aa48"
+        "53e1d116.7a486",
+        "e5f15950.d2b488",
+        "f3bdd2ba.fa4b4",
+        "19ed1ade.774285"
       ]
     ]
   },
   {
-    "id": "11b2d666.19a8fa",
+    "id": "53e1d116.7a486",
     "type": "switchNode",
     "name": "switch  svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 671.9479293823242,
-    "y": 24.28428077697754,
-    "z": "548da231.570f2c",
+    "x": 680.9205856323242,
+    "y": 138.25693607330322,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "563fe857.005428"
+        "e201ddb1.b905"
       ]
     ]
   },
   {
-    "id": "563fe857.005428",
+    "id": "e201ddb1.b905",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 883.6623001098633,
-    "y": 24.28429126739502,
-    "z": "548da231.570f2c",
+    "x": 890.6349487304688,
+    "y": 137.25694751739502,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "bf9c002.703e6"
+        "2d1ab943.03f3d6"
       ]
     ]
   },
   {
-    "id": "bf9c002.703e6",
+    "id": "2d1ab943.03f3d6",
     "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=\"sdnc-request-header.svc-request-id is a required input\" />\n",
     "comments": "",
-    "x": 1058.0908508300781,
-    "y": 23.28428363800049,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1065.0634994506836,
+    "y": 136.2569398880005,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a0f1dfee.c1db9",
+    "id": "e5f15950.d2b488",
     "type": "switchNode",
     "name": "switch svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 656.9478225708008,
-    "y": 366.2843084335327,
-    "z": "548da231.570f2c",
+    "x": 464.92047119140625,
+    "y": 389.2569742202759,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6b1eefd1.a4726",
-        "517bdb12.579b84",
-        "352e24a0.788a7c",
-        "92374a0f.2f7d98",
-        "eb87ceea.db236"
+        "4fc16b2d.fa1904",
+        "2374157d.59a87a",
+        "1cb25e54.ccc152",
+        "8cd348c0.4aba88",
+        "7e69dc53.dacb04"
       ]
     ]
   },
   {
-    "id": "6b1eefd1.a4726",
+    "id": "4fc16b2d.fa1904",
     "type": "outcome",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 882.4479789733887,
-    "y": 194.28435230255127,
-    "z": "548da231.570f2c",
+    "x": 646.4206275939941,
+    "y": 300.25702476501465,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "2f04939.a9b436c"
+        "62f2f74b.222b28"
       ]
     ]
   },
   {
-    "id": "517bdb12.579b84",
+    "id": "2374157d.59a87a",
     "type": "outcome",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 884.4599838256836,
-    "y": 772.1745042800903,
-    "z": "548da231.570f2c",
+    "x": 651.4328269958496,
+    "y": 582.1471920013428,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "c9b924ac.aa4418"
+        "bf7c4189.d4114"
       ]
     ]
   },
   {
-    "id": "352e24a0.788a7c",
+    "id": "1cb25e54.ccc152",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 885.2218246459961,
-    "y": 958.6029243469238,
-    "z": "548da231.570f2c",
+    "x": 648.1945915222168,
+    "y": 654.5756464004517,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "313b0ba4.9277b4"
+        "14bee845.382418"
       ]
     ]
   },
   {
-    "id": "313b0ba4.9277b4",
+    "id": "14bee845.382418",
     "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=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
     "comments": "",
-    "x": 1068.793357849121,
-    "y": 959.2220649719238,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 831.7661247253418,
+    "y": 655.1947870254517,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "c9b924ac.aa4418",
+    "id": "bf7c4189.d4114",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1066.6028099060059,
-    "y": 772.8409547805786,
-    "z": "548da231.570f2c",
+    "x": 833.5756530761719,
+    "y": 582.813642501831,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "21ee0580.01132a"
+        "93839262.d70fa"
       ]
     ]
   },
   {
-    "id": "72eb1342.c73a6c",
+    "id": "11d0fd2e.8d1473",
     "type": "other",
     "name": "DeleteSOTNAttachmentInstance",
     "xml": "<outcome value='DeleteSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1380.3171997070312,
-    "y": 786.8409357070923,
-    "z": "548da231.570f2c",
+    "x": 1298.2901344299316,
+    "y": 551.8136596679688,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "77510c5b.922da4",
+    "id": "25e7d254.79a53e",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1313.3174514770508,
-    "y": 875.8410797119141,
-    "z": "548da231.570f2c",
+    "x": 1220.2902450561523,
+    "y": 601.8138084411621,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "69dd5310.b0e50c"
+        "58f1ca81.4b3774"
       ]
     ]
   },
   {
-    "id": "69dd5310.b0e50c",
+    "id": "58f1ca81.4b3774",
     "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1500.3174514770508,
-    "y": 876.8410797119141,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1407.2902450561523,
+    "y": 602.8138084411621,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a0b8065a.68d4e8",
+    "id": "bede7ad6.c52858",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1743.3170852661133,
-    "y": 500.84095668792725,
-    "z": "548da231.570f2c",
+    "x": 1561.2900390625,
+    "y": 440.8136692047119,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6c6e8419.13924c",
-        "d81b196b.de9bf8"
+        "9003dc0.c133528",
+        "eba16a4b.e63458"
       ]
     ]
   },
   {
-    "id": "6c6e8419.13924c",
+    "id": "9003dc0.c133528",
     "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": 1994.3169059753418,
-    "y": 536.8409214019775,
-    "z": "548da231.570f2c",
+    "x": 1784.2896137237549,
+    "y": 439.8135929107666,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "3455ba94.f30a46"
+        "ce15a307.ea6db"
       ]
     ]
   },
   {
-    "id": "3455ba94.f30a46",
+    "id": "ce15a307.ea6db",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2005.3169212341309,
-    "y": 625.8409004211426,
-    "z": "548da231.570f2c",
+    "x": 1964.2896766662598,
+    "y": 438.81360816955566,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "42c69ed2.4c6e3"
+        "d45df1e5.8c102"
       ]
     ]
   },
   {
-    "id": "42c69ed2.4c6e3",
+    "id": "d45df1e5.8c102",
     "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=\"network-request-input.network-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 2161.745632171631,
-    "y": 624.8409004211426,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1996.7183303833008,
+    "y": 494.81362438201904,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "d81b196b.de9bf8",
+    "id": "eba16a4b.e63458",
     "type": "execute",
     "name": "execute requiredParameter",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id\" value=\"$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1997.0313415527344,
-    "y": 464.98375606536865,
-    "z": "548da231.570f2c",
+    "x": 1788.004093170166,
+    "y": 401.9564437866211,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "57efdb7e.7de474",
+    "id": "f3bdd2ba.fa4b4",
     "type": "switchNode",
     "name": "switch service-instance-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.service-information.service-instance-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 697.0312728881836,
-    "y": 67.99399757385254,
-    "z": "548da231.570f2c",
+    "x": 704.0039215087891,
+    "y": 180.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "85a4ddfa.563bf"
+        "840d370d.dae7a8"
       ]
     ]
   },
   {
-    "id": "85a4ddfa.563bf",
+    "id": "840d370d.dae7a8",
     "type": "other",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 913.4598617553711,
-    "y": 68.99399757385254,
-    "z": "548da231.570f2c",
+    "x": 920.4325103759766,
+    "y": 181.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "e5b10c87.6dcab"
+        "78d3f021.91704"
       ]
     ]
   },
   {
-    "id": "e5b10c87.6dcab",
+    "id": "78d3f021.91704",
     "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=\"service-information.service-instance-id is a required input\" />\n",
     "comments": "",
-    "x": 1071.8883895874023,
-    "y": 67.99399757385254,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1078.8610382080078,
+    "y": 180.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "2f04939.a9b436c",
+    "id": "62f2f74b.222b28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1047.253620147705,
-    "y": 191.9940309524536,
-    "z": "548da231.570f2c",
+    "x": 811.2262687683105,
+    "y": 297.966703414917,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "99cb6d0f.faec9"
+        "b9263adf.a79a98"
       ]
     ]
   },
   {
-    "id": "99cb6d0f.faec9",
+    "id": "b9263adf.a79a98",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1142.4890975952148,
-    "y": 255.4991979598999,
-    "z": "548da231.570f2c",
+    "x": 1001.4617919921875,
+    "y": 299.4719018936157,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "12b9b32c.a4b30d",
-        "46ff1495.b090cc"
+        "daaeed0a.68f55",
+        "32fc1c5a.a1c7a4"
       ]
     ]
   },
   {
-    "id": "12b9b32c.a4b30d",
+    "id": "daaeed0a.68f55",
     "type": "outcome",
     "name": "CreateSOTNAttachmentInstance",
     "xml": "<outcome value='CreateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1397.8223190307617,
-    "y": 138.49896335601807,
-    "z": "548da231.570f2c",
+    "x": 1282.7950744628906,
+    "y": 278.47163105010986,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a1752dfc.73195"
+        "1d50a6f4.652229"
       ]
     ]
   },
   {
-    "id": "46ff1495.b090cc",
+    "id": "32fc1c5a.a1c7a4",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1330.8223152160645,
-    "y": 284.1656885147095,
-    "z": "548da231.570f2c",
+    "x": 1201.7950973510742,
+    "y": 326.1383662223816,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "67468b53.41b5e4"
+        "ab38e26c.3455"
       ]
     ]
   },
   {
-    "id": "67468b53.41b5e4",
+    "id": "ab38e26c.3455",
     "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=\"sdnc-request-header.request-action is invalid\" />\n",
     "comments": "",
-    "x": 1529.3781509399414,
-    "y": 283.61034536361694,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1400.3509330749512,
+    "y": 325.58302307128906,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a1752dfc.73195",
+    "id": "1d50a6f4.652229",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1653.6977615356445,
-    "y": 136.88288116455078,
-    "z": "548da231.570f2c",
+    "x": 1514.6704368591309,
+    "y": 280.85553073883057,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "db455346.fe8d9"
+        "15baa2b8.a5423d"
       ]
     ]
   },
   {
-    "id": "db455346.fe8d9",
+    "id": "15baa2b8.a5423d",
     "type": "for",
     "name": "for loop i - Sotn input param",
     "xml": "<for index=\"i\" start=\"0\" end=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1735.3287467956543,
-    "y": 197.18352508544922,
-    "z": "548da231.570f2c",
+    "x": 1720.3014526367188,
+    "y": 276.15617847442627,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "250dfbd6.f87e24"
+        "1411c83d.30f948"
       ]
     ]
   },
   {
-    "id": "250dfbd6.f87e24",
+    "id": "1411c83d.30f948",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1929.4120750427246,
-    "y": 161.93047618865967,
-    "z": "548da231.570f2c",
+    "x": 1882.384853363037,
+    "y": 233.90312957763672,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6411a252.efa3dc",
-        "bd70a50a.f57aa8",
-        "bce7ba47.627aa8"
+        "8cd60ce0.f328b",
+        "7c6899b1.f878f8",
+        "a0ef1495.11fa68"
       ]
     ]
   },
   {
-    "id": "6411a252.efa3dc",
+    "id": "8cd60ce0.f328b",
     "type": "set",
     "name": "clear tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
     "comments": "",
-    "x": 2121.412136077881,
-    "y": 116.16857433319092,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2041.3849601745605,
+    "y": 188.14123916625977,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "bd70a50a.f57aa8",
+    "id": "7c6899b1.f878f8",
     "type": "set",
     "name": "set tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].value`\"/>\n",
     "comments": "",
-    "x": 2110.4121322631836,
-    "y": 193.16857862472534,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2039.3848342895508,
+    "y": 220.14124202728271,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "bce7ba47.627aa8",
+    "id": "a0ef1495.11fa68",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.name`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2110.4122161865234,
-    "y": 275.16857862472534,
-    "z": "548da231.570f2c",
+    "x": 2036.3849563598633,
+    "y": 260.1412477493286,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "9a3c6ac9.101328",
-        "b44b4e5e.93a68",
-        "c46018d4.cde2f8",
-        "bf279f01.56146",
-        "2718b920.5086d6",
-        "9dec1793.d77e58",
-        "6b903ba1.e89184",
-        "9610c6b4.d4b598"
+        "58732708.c19e68",
+        "2b1a4a1c.736d86",
+        "ac680bd3.a5c298",
+        "38c84211.606bbe",
+        "668e89b6.3edf98",
+        "eee3ac82.081b3",
+        "232cba3c.20f5a6",
+        "553b7c39.9758e4"
       ]
     ]
   },
   {
-    "id": "9a3c6ac9.101328",
+    "id": "58732708.c19e68",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2312.4763164520264,
-    "y": 618.9942054748535,
-    "z": "548da231.570f2c",
+    "x": 2243.449363708496,
+    "y": 397.96692180633545,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "75de126c.4ad7cc"
+        "9929f9d1.8bdb78"
       ]
     ]
   },
   {
-    "id": "75de126c.4ad7cc",
+    "id": "9929f9d1.8bdb78",
     "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=\"`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
     "comments": "",
-    "x": 2487.476665496826,
-    "y": 614.9942588806152,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2395.4495735168457,
+    "y": 392.9669542312622,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "21ee0580.01132a",
+    "id": "93839262.d70fa",
     "type": "switchNode",
     "name": "switch request-action",
-    "xml": "<switch test='`$sotn-topology-operation-input.request-information.request-action`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1088.6980628967285,
-    "y": 851.994065284729,
-    "z": "548da231.570f2c",
+    "x": 1031.6709442138672,
+    "y": 584.966794013977,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "72eb1342.c73a6c",
-        "77510c5b.922da4"
+        "11d0fd2e.8d1473",
+        "25e7d254.79a53e"
       ]
     ]
   },
   {
-    "id": "b44b4e5e.93a68",
+    "id": "2b1a4a1c.736d86",
     "type": "other",
     "name": "sotnVpnName",
     "xml": "<outcome value='sotnVpnName'>",
     "comments": "",
     "outputs": 1,
-    "x": 2327.4757356643677,
-    "y": 144.19395065307617,
-    "z": "548da231.570f2c",
+    "x": 2263.44863986969,
+    "y": 142.1666374206543,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "b99955f0.4e5fc8",
+    "id": "938831fe.ccb6b",
     "type": "switchNode",
     "name": "switch value",
     "xml": "<switch test=\"`$tmp.value`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2558.3922157287598,
-    "y": 333.20887565612793,
-    "z": "548da231.570f2c",
+    "x": 2526.3655128479004,
+    "y": 257.18157863616943,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "79ab6adb.1f2014"
+        "bbabb9a8.e7fa88"
       ]
     ]
   },
   {
-    "id": "79ab6adb.1f2014",
+    "id": "bbabb9a8.e7fa88",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2742.3921394348145,
-    "y": 329.208890914917,
-    "z": "548da231.570f2c",
+    "x": 2664.3654823303223,
+    "y": 252.18159866333008,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "cf098d97.55fb"
+        "7d365ba9.43c364"
       ]
     ]
   },
   {
-    "id": "cf098d97.55fb",
+    "id": "7d365ba9.43c364",
     "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=\"`'$tmp.name +' is a required input'`\" />\n",
     "comments": "",
-    "x": 2750.821060180664,
-    "y": 403.2088851928711,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2786.7941932678223,
+    "y": 289.1815767288208,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "c46018d4.cde2f8",
+    "id": "ac680bd3.a5c298",
     "type": "other",
     "name": "clientSignal",
     "xml": "<outcome value='clientSignal'>",
     "comments": "",
     "outputs": 1,
-    "x": 2333.475742340088,
-    "y": 213.19396114349365,
-    "z": "548da231.570f2c",
+    "x": 2256.4488105773926,
+    "y": 179.16665935516357,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "bf279f01.56146",
+    "id": "38c84211.606bbe",
     "type": "other",
     "name": "access-provider-id",
     "xml": "<outcome value='access-provider-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2335.3646812438965,
-    "y": 289.1939239501953,
-    "z": "548da231.570f2c",
+    "x": 2276.3377571105957,
+    "y": 215.16660690307617,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "2718b920.5086d6",
+    "id": "668e89b6.3edf98",
     "type": "other",
     "name": "access-client-id",
     "xml": "<outcome value='access-client-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2332.3646812438965,
-    "y": 361.19392371177673,
-    "z": "548da231.570f2c",
+    "x": 2265.337661743164,
+    "y": 254.16663455963135,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "9dec1793.d77e58",
+    "id": "eee3ac82.081b3",
     "type": "other",
     "name": "access-topology-id",
     "xml": "<outcome value='access-topology-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2336.3646812438965,
-    "y": 423.1939239501953,
-    "z": "548da231.570f2c",
+    "x": 2274.3377532958984,
+    "y": 289.16660594940186,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "6b903ba1.e89184",
+    "id": "232cba3c.20f5a6",
     "type": "other",
     "name": "access-node-id",
     "xml": "<outcome value='access-node-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2338.3648529052734,
-    "y": 488.19395637512207,
-    "z": "548da231.570f2c",
+    "x": 2265.3377571105957,
+    "y": 325.1666440963745,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "9610c6b4.d4b598",
+    "id": "553b7c39.9758e4",
     "type": "other",
     "name": "cVLAN",
     "xml": "<outcome value='cVLAN'>",
     "comments": "",
     "outputs": 1,
-    "x": 2316.3651542663574,
-    "y": 552.7496566772461,
-    "z": "548da231.570f2c",
+    "x": 2240.338275909424,
+    "y": 360.72238540649414,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "92374a0f.2f7d98",
+    "id": "8cd348c0.4aba88",
     "type": "outcome",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 883.5312347412109,
-    "y": 364.53126430511475,
-    "z": "548da231.570f2c",
+    "x": 646.5038909912109,
+    "y": 387.5039529800415,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "40ca4bfa.dde754"
+        "55079242.de61dc"
       ]
     ]
   },
   {
-    "id": "40ca4bfa.dde754",
+    "id": "55079242.de61dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1064.3369064331055,
-    "y": 365.24098110198975,
-    "z": "548da231.570f2c",
+    "x": 827.3095626831055,
+    "y": 388.2136697769165,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "38d46ef5.2515a2"
+        "4e961c0d.873094"
       ]
     ]
   },
   {
-    "id": "38d46ef5.2515a2",
+    "id": "4e961c0d.873094",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1137.5723876953125,
-    "y": 445.74612522125244,
-    "z": "548da231.570f2c",
+    "x": 1015.5450439453125,
+    "y": 389.7188367843628,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "bc03657f.d968f8",
-        "c7a46845.a20028"
+        "5f2b72b3.993c4c",
+        "80608f20.06ea9"
       ]
     ]
   },
   {
-    "id": "bc03657f.d968f8",
+    "id": "5f2b72b3.993c4c",
     "type": "outcome",
     "name": "ActivateSOTNAttachmentInstance",
     "xml": "<outcome value='ActivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1393.9055290222168,
-    "y": 375.7458610534668,
-    "z": "548da231.570f2c",
+    "x": 1284.8783226013184,
+    "y": 363.71854877471924,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "c7a46845.a20028",
+    "id": "80608f20.06ea9",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1310.905445098877,
-    "y": 484.41266107559204,
-    "z": "548da231.570f2c",
+    "x": 1200.8781394958496,
+    "y": 413.3853511810303,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "62ba5aa1.e5bf54"
+        "cc018098.4c869"
       ]
     ]
   },
   {
-    "id": "62ba5aa1.e5bf54",
+    "id": "cc018098.4c869",
     "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=\"sdnc-request-header.request-action is invalid\" />\n",
     "comments": "",
-    "x": 1509.461280822754,
-    "y": 483.8573179244995,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1340.434097290039,
+    "y": 416.8300075531006,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "eb87ceea.db236",
+    "id": "7e69dc53.dacb04",
     "type": "outcome",
     "name": "deactivate",
     "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 881.5311889648438,
-    "y": 584.53125,
-    "z": "548da231.570f2c",
+    "x": 659.5039253234863,
+    "y": 487.5039005279541,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "10580d5c.7277e3"
+        "5e98d5e.da18e2c"
       ]
     ]
   },
   {
-    "id": "10580d5c.7277e3",
+    "id": "5e98d5e.da18e2c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1063.674015045166,
-    "y": 585.1977005004883,
-    "z": "548da231.570f2c",
+    "x": 841.6467514038086,
+    "y": 488.1703510284424,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "97009550.34e988"
+        "e876eace.fbc408"
       ]
     ]
   },
   {
-    "id": "a7478b0d.ac1368",
+    "id": "674c6e42.5758f",
     "type": "other",
     "name": "DeactivateSOTNAttachmentInstance",
     "xml": "<outcome value='DeactivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1377.3884048461914,
-    "y": 599.197681427002,
-    "z": "548da231.570f2c",
+    "x": 1303.3611869812012,
+    "y": 459.1703567504883,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "f5f85a41.420a68",
+    "id": "3d6789d5.968686",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1310.388656616211,
-    "y": 688.1978254318237,
-    "z": "548da231.570f2c",
+    "x": 1207.3614921569824,
+    "y": 508.17051124572754,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "e751aaad.be4338"
+        "7dd7d50b.2e0d4c"
       ]
     ]
   },
   {
-    "id": "e751aaad.be4338",
+    "id": "7dd7d50b.2e0d4c",
     "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1497.388656616211,
-    "y": 689.1978254318237,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1394.3614921569824,
+    "y": 509.17051124572754,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "97009550.34e988",
+    "id": "e876eace.fbc408",
     "type": "switchNode",
     "name": "switch request-action",
-    "xml": "<switch test='`$sotn-topology-operation-input.request-information.request-action`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1085.7692680358887,
-    "y": 664.3508110046387,
-    "z": "548da231.570f2c",
+    "x": 1028.7420654296875,
+    "y": 487.3234739303589,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a7478b0d.ac1368",
-        "f5f85a41.420a68"
+        "674c6e42.5758f",
+        "3d6789d5.968686"
       ]
     ]
   },
   {
-    "id": "e66639cf.56aa48",
+    "id": "19ed1ade.774285",
     "type": "switchNode",
     "name": "switch parent-service-instance-id",
-    "xml": "<switch test='`$connection-attachment-topology-operation-input.service-information.parent-service-instance-id`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 713.0103988647461,
-    "y": 114.01042175292969,
-    "z": "548da231.570f2c",
+    "x": 719.9830474853516,
+    "y": 226.9830780029297,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "2f054da9.55b662"
+        "6bc4dd76.e36a44"
       ]
     ]
   },
   {
-    "id": "2f054da9.55b662",
+    "id": "6bc4dd76.e36a44",
     "type": "other",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 919.43896484375,
-    "y": 118.01041412353516,
-    "z": "548da231.570f2c",
+    "x": 926.4116134643555,
+    "y": 230.98307037353516,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "271d7aba.ca1876"
+        "a93ef8b3.222ac8"
       ]
     ]
   },
   {
-    "id": "271d7aba.ca1876",
+    "id": "a93ef8b3.222ac8",
     "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=\"service-information.parent-service-instance-id is a required input\" />\n",
     "comments": "",
-    "x": 1077.8674926757812,
-    "y": 117.01041412353516,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1084.8401412963867,
+    "y": 229.98307037353516,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
index c5d13775..ff587ce8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
@@ -1,82 +1,82 @@
-<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}'>
-   <method rpc='connection-attachment-topology-operation' mode='sync'>
-      <block atomic="true">
-         <call module='GENERIC-RESOURCE-API' rpc='validate-connection-attachment-input' mode='sync' ></call>
-         <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
-            <outcome value='create'>
-               <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                  <outcome value='CreateSOTNAttachmentInstance'>
-                     <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-create' mode='sync' ></call>
-                  </outcome>
-                  <outcome value='other'>
-                     <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
-                     </return>
-                  </outcome>
-               </switch>
-            </outcome>
-            <outcome value='activate'>
-               <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                  <outcome value='ActivateSOTNAttachmentInstance'>
-                     <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' ></call>
-                  </outcome>
-                  <outcome value='other'>
-                     <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
-                     </return>
-                  </outcome>
-               </switch>
-            </outcome>
-            <outcome value='delete'>
-               <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                  <outcome value='DeactivateSOTNAttachmentInstance'>
-                     <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' ></call>
-                  </outcome>
-                  <outcome value='other'>
-                     <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
-                     </return>
-                  </outcome>
-               </switch>
-            </outcome>
-            <outcome value='deactivate'>
-               <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                  <outcome value='DeleteSOTNAttachmentInstance'>
-                     <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-delete' mode='sync' ></call>
-                  </outcome>
-                  <outcome value='other'>
-                     <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
-                     </return>
-                  </outcome>
-               </switch>
-            </outcome>
-            <outcome value='Other'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="sdnc-request-header.svc-action is invalid" />
-               </return>
-            </outcome>
-         </switch>
-         <set>
-            <parameter name="ack-final" value="Y"/>
-         </set>
-         <return status='success'>
-            <parameter name="ack-final-indicator" value="Y" />
-            <parameter name="error-code" value="200" />
-            <parameter name="error-message" value="`$error-message`" />
-         </return>
-      </block>
-   </method>
+<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}'>
+    <method rpc='connection-attachment-topology-operation' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-connection-attachment-input' mode='sync' ></call>
+            <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value='create'>
+                    <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                        <outcome value='CreateSOTNAttachmentInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-create' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='activate'>
+                    <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                        <outcome value='ActivateSOTNAttachmentInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='deactivate'>
+                    <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeactivateSOTNAttachmentInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='delete'>
+                    <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeleteSOTNAttachmentInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-delete' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="sdnc-request-header.svc-action is invalid" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="ack-final" value="Y"/>
+            </set>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index 8d9c12e4..23b28c85 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -1,570 +1,599 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-                                    </set>
-                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-                                        <outcome value='Created'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" 
-    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-                                            </return>
-                                        </outcome>
-                                    </switch>
-                                    <set>
-                                        <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`' />
-                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-                                        <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`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: SOTN resource not found" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="404" />
-                            <parameter name="error-message" value="Error: SOTN resource not found" />
-                        </return>
-                    </block>
-                </outcome>
-            </get-resource>
-            <block atomic="true">
-                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-            </block>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: SOTN resource not found" />
-                    </return>
-                </outcome>
-            </get-resource>
-            <set>
-                <parameter name='tmp.found-in-ar' value='false' />
-                <parameter name='tmp.found-in-network' value='false' />
-                <parameter name='tmp.ep-available' value='false' />
-            </set>
-            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-                <outcome value='2'>
-                    <block atomic="true">
-                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <block></block>
-                                </outcome>
-                                <outcome value='false'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.pidx' value='`$pidx`' />
-                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-                                            <parameter name='tmp.found-in-ar' value='true' />
-                                            <parameter name='tmp.ep-available' value='true' />
-                                        </set>
-                                        <break></break>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.found-in-ar`'>
-                            <outcome value='true'>
-                                <block atomic="true">
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >
-                                        <outcome value='success'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="404" />
-                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
-                                            </return>
-                                        </outcome>
-                                    </get-resource>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='1'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-psd.networks.network_length`'>
-                            <outcome value='1'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-                                    </set>
-                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-                                        <block>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='tmp.found-in-network' value='true' />
-                                                        <parameter name='tmp.ep-available' value='true' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <return status='success'>
-                                                <parameter name="ack-final-indicator" value="Y" />
-                                                <parameter name="error-code" value="200" />
-                                                <parameter name="error-message" value="`$error-message`" />
-                                            </return>
-                                        </block>
-                                    </for>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: SOTN resource not found" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$tmp.ep-available`'>
-                <outcome value='false'>
-                    <block></block>
-                </outcome>
-                <outcome value='true'>
-                    <block atomic="true">
-                        <switch test='`$tmp.found-in-ar`'>
-                            <outcome value='true'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >
-                            <block>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <return status='success'>
-                                    <parameter name="ack-final-indicator" value="Y" />
-                                    <parameter name="error-code" value="200" />
-                                    <parameter name="error-message" value="`$error-message`" />
-                                </return>
-                            </block>
-                        </for>
-                        <block atomic="true">
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url'`" />
-                                <parameter name="restapiUser" value="`$prop.oof.user`" />
-                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="post"/>
-                                <parameter name="responsePrefix" value="oof"/>
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.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>
-                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
-                                    </set>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="pnf.pnf-name = $oof.vpn.access-node-id AND 
-		     depth = '0'"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='not-found'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                            </return>
-                                        </outcome>
-                                    </get-resource>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                            </set>
-                                        </outcome>
-                                        <outcome value='not-found'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                            </return>
-                                        </outcome>
-                                    </get-resource>
-                                    <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.openecomp.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>
-                                    <set>
-                                        <parameter name='tmp.vpnName' value='`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`' />
-                                    </set>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
-      key='vpn-binding.vpn-id = $tmp.vpnName' >
-                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
-                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
-                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
-                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
-                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
-                                        <parameter name='cvlan-tag-entry' value='`$prop.connection-attachment.cVLAN`' />
-                                        <parameter name='operational-status' value='Created' />
-                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                        <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
-                                    </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.networks.network[0].network-id`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.networks.network[0].network-id`" />
-                                    </save>
-                                    <set>
-                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
-                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
-                                    </set>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $src-ltpId`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
-                                    </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
-      key='vpn-binding.vpn-id = $tmp.vpnName 
-      force="true" pfx="tmp.AnAI-data">
-                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $dst-ltpId`" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
-                                    </save>
-                                </block>
-                            </for>
-                        </block>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-            </set>
-            <set>
-                <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.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <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`' />
-                <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`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </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 updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		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 AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-                <parameter name="operational-status" value="Active" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </update>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Created'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <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`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <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`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Connection attachment resource not exist" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: Connection attachment resource not exist" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+                <parameter name="outputPath" value="tmp.ar-url-psd"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-psd" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: Parent service data not available" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                        <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                                        <parameter name="outputPath" value="tmp.ar-other-url-connection"/>
+                                        <parameter name="target" value="{allotted-resource-id}"/>
+                                        <parameter name="replacement" value="`$tmp.provided-ar.allotted-resource-id`"/>
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />
+                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='GET' />
+                                        <parameter name="responsePrefix" value="mdsal-other-ar" />
+                                        <outcome value='success'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="404" />
+                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.service-data.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: End points not available" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <set>
+                                        <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.`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>
+                            <block>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
+                            </block>
+                        </for>
+                        <block atomic="true">
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="post"/>
+                                <parameter name="responsePrefix" value="oof"/>
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.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 OOF api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block></block>
+                                </outcome>
+                            </execute>
+                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
+                                    </set>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id 
+		AND pnf.pnf-name = $oof.vpn.access-node-id 
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <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.openecomp.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>
+                                    <set>
+                                        <parameter name='tmp.vpnName' value="`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' >
+                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
+                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
+                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
+                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
+                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
+                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
+                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                        <parameter name='operational-status' value='Created' />
+                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.service-data.networks.network[0].network-id`" />
+                                    </save>
+                                    <set>
+                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
+                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $src-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $dst-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
+                                    </save>
+                                </block>
+                            </for>
+                        </block>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </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 updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		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 AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Active" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 727246a3..5ecae563 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,256 +1,267 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
-        <block atomic="true">
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='error-code' value='' />
-                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
-                            </return>
-                        </outcome>
-                    </execute>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                    </set>
-                </outcome>
-            </switch>
-            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <set>
-                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
-                    </set>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </get-resource>
-            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='tmp.cidx' value="`0`" />
-                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='tmp.found-cidx' value="`false`" />
-                        </set>
-                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.found-cidx`'>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <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` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.parent-ar-url`"/>
-                <parameter name="outputPath" value="tmp.parent-ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="parent" />
-                <outcome value='success'>
-                    <block></block>
-                </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 updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-                <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.` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            </set>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
-value="`$connection-attachment-ar-identifiers.`" />
-            </set>
-            <set>
-                <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.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <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`' />
-                <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`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </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 updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		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 AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
-                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
-                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
-                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
-                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
-                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
-                <parameter name="cvlan-tag-entry" value="`$prop.connection-attachment.cVLAN`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-                <parameter name="operational-status" value="Created" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </update>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='' />
+                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+                            </return>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                    </set>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+                    </set>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='failure'>
+                    <block></block>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </execute>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.cidx' value="`0`" />
+                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='tmp.found-cidx' value="`false`" />
+                        </set>
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-cidx`'>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <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` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.parent-ar-url`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="parent" />
+                <outcome value='success'>
+                    <block></block>
+                </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 updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+                <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.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
+value="`$connection-attachment-ar-identifiers.`" />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </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 updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		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 AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
+                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
+                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Created" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index e11ef2fb..4a6baad7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -1,371 +1,400 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-                <outcome value='success'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-                                    </set>
-                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-                                        <outcome value='Active'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" 
-    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-                                            </return>
-                                        </outcome>
-                                    </switch>
-                                    <set>
-                                        <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`' />
-                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-                                        <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`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: SOTN resource not found" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="404" />
-                            <parameter name="error-message" value="Error: SOTN resource not found" />
-                        </return>
-                    </block>
-                </outcome>
-            </get-resource>
-            <block atomic="true">
-                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-            </block>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: SOTN resource not found" />
-                    </return>
-                </outcome>
-            </get-resource>
-            <set>
-                <parameter name='tmp.found-in-ar' value='false' />
-                <parameter name='tmp.found-in-network' value='false' />
-                <parameter name='tmp.ep-available' value='false' />
-            </set>
-            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-                <outcome value='2'>
-                    <block atomic="true">
-                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <block></block>
-                                </outcome>
-                                <outcome value='false'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.pidx' value='`$pidx`' />
-                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-                                            <parameter name='tmp.found-in-ar' value='true' />
-                                            <parameter name='tmp.ep-available' value='true' />
-                                        </set>
-                                        <break></break>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </block>
-                </outcome>
-                <outcome value='1'>
-                    <block atomic="true">
-                        <switch test='`$mdsal-psd.networks.network_length`'>
-                            <outcome value='1'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-                                    </set>
-                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-                                        <block>
-                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='tmp.found-in-network' value='true' />
-                                                        <parameter name='tmp.ep-available' value='true' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                            <return status='success'>
-                                                <parameter name="ack-final-indicator" value="Y" />
-                                                <parameter name="error-code" value="200" />
-                                                <parameter name="error-message" value="`$error-message`" />
-                                            </return>
-                                        </block>
-                                    </for>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="404" />
-                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: SOTN resource not found" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$tmp.ep-available`'>
-                <outcome value='false'>
-                    <block></block>
-                </outcome>
-                <outcome value='true'>
-                    <block atomic="true">
-                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="connectivity" 
-		key="connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND 
-		     depth = '1'"
-        pfx='tmp.connectivity' local-only='false' >
-                            <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >
-                                <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>
-                                    <outcome value='vpn-binding'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " />
-                                            </set>
-                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                <parameter name="original_string" value='`$tmp.vpn-name`'/>
-                                                <parameter name="regex" value="-"/>
-                                                <parameter name="ctx_memory_result_key" value="route1"/>
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='tmp.node-id' value='`$route1[0]`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='error-code' value='' />
-                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                    </return>
-                                                </outcome>
-                                            </execute>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="pnf" 
-		key="pnf.pnf-name = $tmp.node-id AND 
-		     depth = '0'"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                            </get-resource>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="esr-thirdparty-sdnc" 
-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
-		     depth = '1'"
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-                                                    </return>
-                                                </outcome>
-                                            </get-resource>
-                                            <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.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.openecomp.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>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </get-resource>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-            </set>
-            <set>
-                <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.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-                <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`' />
-                <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`' />
-                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </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 updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="allotted-resource" 
-		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 AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-                <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-                <parameter name="operational-status" value="PendingDelete" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </update>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Active'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <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`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <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`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: SOTN resource not found" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: SOTN resource not found" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+                <parameter name="outputPath" value="tmp.ar-url-psd"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-psd" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.service-data.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="connectivity" 
+		key="connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND 
+		     depth = '1'"
+        pfx='tmp.connectivity' local-only='false' >
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Connectivity resource not found" />
+                                </return>
+                            </outcome>
+                            <outcome value='success'>
+                                <block>
+                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >
+                                        <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>
+                                            <outcome value='vpn-binding'>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " />
+                                                    </set>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                        <parameter name="original_string" value='`$tmp.vpn-name`'/>
+                                                        <parameter name="regex" value="-"/>
+                                                        <parameter name="ctx_memory_result_key" value="route1"/>
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='tmp.node-id' value='`$route1[0]`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                            </return>
+                                                        </outcome>
+                                                    </execute>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id 
+		AND pnf.pnf-name = $tmp.node-id 
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='Other'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                                        <outcome value='success'>
+                                                            <set>
+                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='Other'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <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.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.openecomp.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>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </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 updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		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 AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="PendingDelete" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
index 1dd02a90..f2ac12f1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
@@ -1,175 +1,185 @@
-<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}'>
-    <method rpc='sotn-attachment-topology-operation-delete' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='Delete' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </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 updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.cidx' value='`$cidx`' />
-                                        </set>
-                                        <break></break>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test="`$tmp.cidx`">
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name="service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx]." value="" />
-                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            </set>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="Error: SOTN resource not found" />
-                    </return>
-                </outcome>
-            </get-resource>
-            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                <outcome value='true'>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='tmp.pidx' value='`$pidx`' />
-                                        </set>
-                                        <break></break>
-                                    </block>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test="`$tmp.pidx`">
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-            </switch>
-            <set>
-                <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" />
-                <parameter name='service-data.provided-allotted-resources.consumed-allotted-resource_length' value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />
-            </set>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-            </set>
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'
-                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 AND
-			allotted-resource.id = $tmp.ar.allotted-resource-id">
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </delete>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
+<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}'>
+    <method rpc='sotn-attachment-topology-operation-delete' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-topology/'` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='Delete' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </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 updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.cidx' value='`$cidx`' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.cidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx]." value="" />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data"/>
+                <parameter name="outputPath" value="tmp.ar-url-psd"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='GET' />
+                <parameter name="responsePrefix" value="mdsal-psd" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </execute>
+            <switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.pidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" />
+                <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource_length" value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />
+            </set>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+            </set>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='allotted-resource'  
+		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 AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id">
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </delete>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
index 98762e99..3359ece8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
@@ -1,236 +1,236 @@
-<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}'>
-   <method rpc='validate-connection-attachment-input' mode='sync'>
-      <block atomic="true">
-         <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
-            <outcome value=''>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
-               </return>
-            </outcome>
-         </switch>
-         <switch test='`$connection-attachment-topology-operation-input.service-information.service-instance-id`'>
-            <outcome value=''>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="service-information.service-instance-id is a required input" />
-               </return>
-            </outcome>
-         </switch>
-         <switch test='`$connection-attachment-topology-operation-input.service-information.parent-service-instance-id`'>
-            <outcome value=''>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="service-information.parent-service-instance-id is a required input" />
-               </return>
-            </outcome>
-         </switch>
-         <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
-            <outcome value='create'>
-               <block atomic="true">
-                  <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                     <outcome value='CreateSOTNAttachmentInstance'>
-                        <block atomic="true">
-                           <for index="i" start="0" end="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param_length`">
-                              <block>
-                                 <set>
-                                    <parameter name='tmp.name' value='' />
-                                    <parameter name='tmp.value' value='' />
-                                 </set>
-                                 <set>
-                                    <parameter name='tmp.name' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].name`"/>
-                                    <parameter name='tmp.value' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].value`"/>
-                                 </set>
-                                 <switch test="`$tmp.name`">
-                                    <outcome value='sotnVpnName'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value='clientSignal'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value='access-provider-id'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value='access-client-id'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value='access-topology-id'></outcome>
-                                    <outcome value='access-node-id'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value='cVLAN'>
-                                       <switch test="`$tmp.value`">
-                                          <outcome value=''>
-                                             <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
-                                             </return>
-                                          </outcome>
-                                       </switch>
-                                    </outcome>
-                                    <outcome value=''>
-                                       <return status='failure'>
-                                          <parameter name='ack-final' value='Y'/>
-                                          <parameter name="error-code" value="500" />
-                                          <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
-                                       </return>
-                                    </outcome>
-                                 </switch>
-                              </block>
-                           </for>
-                        </block>
-                     </outcome>
-                     <outcome value='other'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="sdnc-request-header.request-action is invalid" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-            <outcome value='activate'>
-               <block atomic="true">
-                  <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
-                     <outcome value='ActivateSOTNAttachmentInstance'>
-                        <block atomic="true">
-                           <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
-                              <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
-                           </execute>
-                           <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                              <outcome value=''>
-                                 <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                 </return>
-                              </outcome>
-                           </switch>
-                        </block>
-                     </outcome>
-                     <outcome value='other'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="sdnc-request-header.request-action is invalid" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-            <outcome value='deactivate'>
-               <block atomic="true">
-                  <switch test='`$sotn-topology-operation-input.request-information.request-action`'>
-                     <outcome value='DeactivateSOTNAttachmentInstance'>
-                        <block atomic="true">
-                           <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
-                              <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
-                           </execute>
-                           <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                              <outcome value=''>
-                                 <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                 </return>
-                              </outcome>
-                           </switch>
-                        </block>
-                     </outcome>
-                     <outcome value='Other'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-            <outcome value='delete'>
-               <block atomic="true">
-                  <switch test='`$sotn-topology-operation-input.request-information.request-action`'>
-                     <outcome value='DeleteSOTNAttachmentInstance'>
-                        <block atomic="true">
-                           <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
-                              <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
-                           </execute>
-                           <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-                              <outcome value=''>
-                                 <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                 </return>
-                              </outcome>
-                           </switch>
-                        </block>
-                     </outcome>
-                     <outcome value='Other'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-            <outcome value='Other'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-               </return>
-            </outcome>
-         </switch>
-      </block>
-   </method>
+<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}'>
+    <method rpc='validate-connection-attachment-input' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.service-information.service-instance-id`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="service-information.service-instance-id is a required input" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="service-information.parent-service-instance-id is a required input" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value='create'>
+                    <block atomic="true">
+                        <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateSOTNAttachmentInstance'>
+                                <block atomic="true">
+                                    <for index="i" start="0" end="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param_length`">
+                                        <block>
+                                            <set>
+                                                <parameter name='tmp.name' value='' />
+                                                <parameter name='tmp.value' value='' />
+                                            </set>
+                                            <set>
+                                                <parameter name='tmp.name' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].name`"/>
+                                                <parameter name='tmp.value' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].value`"/>
+                                            </set>
+                                            <switch test="`$tmp.name`">
+                                                <outcome value='sotnVpnName'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value='clientSignal'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value='access-provider-id'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value='access-client-id'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value='access-topology-id'></outcome>
+                                                <outcome value='access-node-id'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value='cVLAN'>
+                                                    <switch test="`$tmp.value`">
+                                                        <outcome value=''>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'$tmp.name +' is a required input'`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                                <outcome value=''>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="sdnc-request-header.request-action is invalid" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='activate'>
+                    <block atomic="true">
+                        <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                            <outcome value='ActivateSOTNAttachmentInstance'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
+                                        <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
+                                    </execute>
+                                    <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                            <outcome value='other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="sdnc-request-header.request-action is invalid" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='deactivate'>
+                    <block atomic="true">
+                        <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeactivateSOTNAttachmentInstance'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
+                                        <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
+                                    </execute>
+                                    <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='delete'>
+                    <block atomic="true">
+                        <switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteSOTNAttachmentInstance'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
+                                        <parameter name="connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id" value="$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id"/>
+                                    </execute>
+                                    <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+                    </return>
+                </outcome>
+            </switch>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg